Mercurial > hg > truffle
changeset 11046:6a0ead6dc6db
8017531: 8010460 changes broke bytecodeInterpreter.cpp
Summary: Replace _indy by _jsr292 and also fix VERIFY_OOP macros.
Reviewed-by: kvn
author | goetz |
---|---|
date | Mon, 24 Jun 2013 16:11:47 +0200 |
parents | 9347cae673f0 |
children | be0600ec1102 |
files | src/share/vm/interpreter/bytecodeInterpreter.cpp |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Jun 26 00:40:13 2013 +0200 +++ b/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Jun 24 16:11:47 2013 +0200 @@ -481,9 +481,9 @@ // So we have a second version of the assertion which handles the case where EnableInvokeDynamic was // switched off because of the wrong classes. if (EnableInvokeDynamic || FLAG_IS_CMDLINE(EnableInvokeDynamic)) { - assert(abs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit"); + assert(labs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit"); } else { - const int extra_stack_entries = Method::extra_stack_entries_for_indy; + const int extra_stack_entries = Method::extra_stack_entries_for_jsr292; assert(labs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + extra_stack_entries + 1), "bad stack limit"); } @@ -2233,7 +2233,7 @@ } Method* method = cache->f1_as_method(); - VERIFY_OOP(method); + if (VerifyOops) method->verify(); if (cache->has_appendix()) { ConstantPool* constants = METHOD->constants(); @@ -2265,8 +2265,7 @@ } Method* method = cache->f1_as_method(); - - VERIFY_OOP(method); + if (VerifyOops) method->verify(); if (cache->has_appendix()) { ConstantPool* constants = METHOD->constants();