# HG changeset patch
# User zgu
# Date 1352490448 28800
# Node ID 4efcd79826f243aed7475de6a14fb623fcad176e
# Parent  ed8b1e39ff4fab0ff5453337cc3c8799ee3c56a2# Parent  8aaef2cee3b27aed2a1698c5fa089356fdf3815e
Merge

diff -r ed8b1e39ff4f -r 4efcd79826f2 src/share/vm/prims/jvmtiClassFileReconstituter.cpp
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Fri Nov 09 11:04:06 2012 -0500
+++ b/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Fri Nov 09 11:47:28 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));