# HG changeset patch
# User kamg
# Date 1338819757 14400
# Node ID e17b61ba7bb3e6456028365987f3b077dfbe3dd4
# Parent  4434fdad6b37225491999d338ef8da56f9ea9da1
7166498: JVM crash in ClassVerifier
Summary: Fixed raw pointer being used after potential safepoint/GC
Reviewed-by: acorn, fparain, dholmes

diff -r 4434fdad6b37 -r e17b61ba7bb3 src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp	Sat Jun 02 07:32:21 2012 -0400
+++ b/src/share/vm/classfile/verifier.cpp	Mon Jun 04 10:22:37 2012 -0400
@@ -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(