# HG changeset patch
# User egahlin
# Date 1403734345 0
# Node ID 62e9d6343cf7a8954c5641ca664f1c9b183c5f5b
# Parent  3a81a26b70383a50fca24737027d179c1e69e4c9# Parent  506eef1dc714e722384dcf53bc9cf1b76100632c
Merge

diff -r 3a81a26b7038 -r 62e9d6343cf7 hotspot/test/runtime/Unsafe/RangeCheck.java
--- a/hotspot/test/runtime/Unsafe/RangeCheck.java	Wed Jun 25 21:36:48 2014 +0200
+++ b/hotspot/test/runtime/Unsafe/RangeCheck.java	Wed Jun 25 22:12:25 2014 +0000
@@ -43,6 +43,7 @@
                 true,
                 "-Xmx32m",
                 "-XX:-TransmitErrorReport",
+                "-XX:-InlineUnsafeOps", // The compiler intrinsics doesn't have the assert
                 DummyClassWithMainRangeCheck.class.getName());
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());