diff -r 033ebbb3746e -r 7adeefaa6d1d hotspot/src/share/vm/opto/loopTransform.cpp
--- a/hotspot/src/share/vm/opto/loopTransform.cpp	Thu Apr 21 09:29:54 2016 +0000
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp	Mon Apr 25 10:51:44 2016 +0200
@@ -2819,7 +2819,7 @@
       if (phase->do_range_check(this, old_new) != 0) {
         cl->mark_has_range_checks();
       }
-    } else {
+    } else if (PostLoopMultiversioning) {
       phase->has_range_checks(this);
     }