--- 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);
     }
 

--- a/hotspot/src/share/vm/runtime/arguments.cpp	Thu Apr 21 09:29:54 2016 +0000
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Mon Apr 25 10:51:44 2016 +0200
@@ -2626,6 +2626,14 @@
     }
     FLAG_SET_CMDLINE(bool, UseCompiler, false);
   }
+#ifdef COMPILER2
+  if (PostLoopMultiversioning && !RangeCheckElimination) {
+    if (!FLAG_IS_DEFAULT(PostLoopMultiversioning)) {
+      warning("PostLoopMultiversioning disabled because RangeCheckElimination is disabled.");
+    }
+    FLAG_SET_CMDLINE(bool, PostLoopMultiversioning, false);
+  }
+#endif
   return status;
 }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/rangechecks/TestRangeCheckEliminationDisabled.java	Mon Apr 25 10:51:44 2016 +0200
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test TestRangeCheckEliminationDisabled
+ * @bug 8154763
+ * @summary Tests PostLoopMultiversioning with RangeCheckElimination disabled.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+PostLoopMultiversioning -XX:-RangeCheckElimination TestRangeCheckEliminationDisabled
+ */
+public class TestRangeCheckEliminationDisabled {
+
+    public static void main(String[] args) {
+      System.out.println("Passed");
+    }
+}
+