diff src/share/vm/graal/graalCompilerToVM.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 5d0bb7d52783
children 310a68c63b69
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Fri Dec 14 10:20:54 2012 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Fri Dec 14 14:35:13 2012 +0100
@@ -620,7 +620,8 @@
   set_int("epochMaskInPlace", (int) markOopDesc::epoch_mask_in_place);
   set_int("biasedLockPattern", (int) markOopDesc::biased_lock_pattern);
   set_int("methodMaxLocalsOffset", in_bytes(Method::size_of_locals_offset()));
-  set_int("methodMaxStackOffset", in_bytes(Method::max_stack_offset()));
+  set_int("methodConstMethodOffset", in_bytes(Method::const_offset()));
+  set_int("constMethodMaxStackOffset", in_bytes(ConstMethod::max_stack_offset()));
   set_int("extraStackEntries", Method::extra_stack_entries());
   set_int("methodAccessFlagsOffset", in_bytes(Method::access_flags_offset()));
   set_int("klassHasFinalizerFlag", JVM_ACC_HAS_FINALIZER);