--- a/hotspot/make/jprt.properties Mon Jun 04 13:29:34 2012 +0200
+++ b/hotspot/make/jprt.properties Fri Jun 08 09:49:49 2012 -0700
@@ -346,12 +346,12 @@
${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \
${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \
- ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC
-# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
-# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
-# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
-# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
-# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
jprt.my.windows.i586.test.targets = \
${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -510,3 +510,6 @@
jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7}
jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
+# 7155453: Work-around to prevent popups on OSX from blocking test completion
+# but the work-around is added to all platforms to be consistent
+jprt.jbb.options=-Djava.awt.headless=true
--- a/hotspot/src/share/vm/classfile/verifier.cpp Mon Jun 04 13:29:34 2012 +0200
+++ b/hotspot/src/share/vm/classfile/verifier.cpp Fri Jun 08 09:49:49 2012 -0700
@@ -1738,10 +1738,14 @@
int target = bci + default_offset;
stackmap_table->check_jump_target(current_frame, target, CHECK_VERIFY(this));
for (int i = 0; i < keys; i++) {
+ // Because check_jump_target() may safepoint, the bytecode could have
+ // moved, which means 'aligned_bcp' is no good and needs to be recalculated.
+ aligned_bcp = (address)round_to((intptr_t)(bcs->bcp() + 1), jintSize);
target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize);
stackmap_table->check_jump_target(
current_frame, target, CHECK_VERIFY(this));
}
+ NOT_PRODUCT(aligned_bcp = NULL); // no longer valid at this point
}
bool ClassVerifier::name_in_supers(