--- a/src/hotspot/share/opto/loopTransform.cpp	Mon Jul 09 11:15:55 2018 -0700
+++ b/src/hotspot/share/opto/loopTransform.cpp	Mon Jul 09 13:25:08 2018 -0700
@@ -861,7 +861,9 @@
 
   // Check for being too big
   if (body_size > (uint)_local_loop_unroll_limit) {
-    if ((UseSubwordForMaxVector || xors_in_loop >= 4) && body_size < (uint)LoopUnrollLimit * 4) return true;
+    if ((cl->is_subword_loop() || xors_in_loop >= 4) && body_size < (uint)LoopUnrollLimit * 4) {
+      return true;
+    }
     // Normal case: loop too big
     return false;
   }