changeset 6976:8aaef2cee3b2

Merge
author minqi
date Thu, 08 Nov 2012 16:48:01 -0800
parents 64812523d72e (diff) 18fb7da42534 (current diff)
children 4efcd79826f2 e26ce0e8b666
files src/share/vm/prims/jvmtiClassFileReconstituter.cpp test/runtime/7158800/BadUtf8.java test/runtime/7158800/InternTest.java test/runtime/7158800/Test7158800.sh test/runtime/7158800/badstrings.txt
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Tue Nov 06 15:09:37 2012 -0500
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Thu Nov 08 16:48:01 2012 -0800
@@ -228,7 +228,7 @@
 
   write_attribute_name_index("Code");
   write_u4(size);
-  write_u2(method->max_stack());
+  write_u2(method->verifier_max_stack());
   write_u2(method->max_locals());
   write_u4(code_size);
   copy_bytecodes(method, (unsigned char*)writeable_address(code_size));