Merge
authoregahlin
Wed, 25 Jun 2014 22:12:25 +0000
changeset 25370 62e9d6343cf7
parent 25369 3a81a26b7038 (current diff)
parent 25368 506eef1dc714 (diff)
child 25371 564ab3b08082
Merge
--- 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());