changeset 25370:62e9d6343cf7

Merge
author egahlin
date Wed, 25 Jun 2014 22:12:25 +0000
parents 3a81a26b7038 506eef1dc714
children 564ab3b08082
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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());