archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8017531: 8010460 changes broke bytecodeInterpreter.cpp

Browse source 
Replace _indy by _jsr292 and also fix VERIFY_OOP macros.

Reviewed-by: kvn
This commit is contained in:
Goetz Lindenmaier 2013-06-24 16:11:47 +02:00
parent 2b66900257
commit 1f6c4015a7
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
View file

@ -481,9 +481,9 @@ BytecodeInterpreter::run(interpreterState istate) {
// So we have a second version of the assertion which handles the case where EnableInvokeDynamic was // So we have a second version of the assertion which handles the case where EnableInvokeDynamic was
// switched off because of the wrong classes. // switched off because of the wrong classes.
if (EnableInvokeDynamic || FLAG_IS_CMDLINE(EnableInvokeDynamic)) { 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 { } 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 assert(labs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + extra_stack_entries
+ 1), "bad stack limit"); + 1), "bad stack limit");
} }
@ -2233,7 +2233,7 @@ run:
} }
Method* method = cache->f1_as_method(); Method* method = cache->f1_as_method();
VERIFY_OOP(method); if (VerifyOops) method->verify();
if (cache->has_appendix()) { if (cache->has_appendix()) {
ConstantPool* constants = METHOD->constants(); ConstantPool* constants = METHOD->constants();
@ -2265,8 +2265,7 @@ run:
} }
Method* method = cache->f1_as_method(); Method* method = cache->f1_as_method();
if (VerifyOops) method->verify();
VERIFY_OOP(method);
if (cache->has_appendix()) { if (cache->has_appendix()) {
ConstantPool* constants = METHOD->constants(); ConstantPool* constants = METHOD->constants();