Mercurial > hg > truffle
diff src/share/vm/graal/graalCompilerToVM.cpp @ 7232:310a68c63b69
Merge.
| author | Christian Haeubl <haeubl@ssw.jku.at> |
|---|---|
| date | Fri, 14 Dec 2012 15:19:38 +0100 |
| parents | c0806f4ff3ea 291ffc492eb6 |
| children | e960cda050d7 79a7b761755c |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp Fri Dec 14 14:53:42 2012 +0100 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Fri Dec 14 15:19:38 2012 +0100 @@ -635,7 +635,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);