Mercurial > hg > truffle
diff src/share/vm/opto/bytecodeInfo.cpp @ 1137:97125851f396
6829187: compiler optimizations required for JSR 292
Summary: C2 implementation for invokedynamic support.
Reviewed-by: kvn, never
| author | twisti |
|---|---|
| date | Tue, 05 Jan 2010 13:05:58 +0100 |
| parents | 15bbd3f505c0 |
| children | dd57230ba8fe |
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp Mon Jan 04 15:21:09 2010 -0800 +++ b/src/share/vm/opto/bytecodeInfo.cpp Tue Jan 05 13:05:58 2010 +0100 @@ -322,14 +322,17 @@ // stricter than callee_holder->is_initialized() ciBytecodeStream iter(caller_method); iter.force_bci(caller_bci); - int index = iter.get_index_int(); - if( !caller_method->is_klass_loaded(index, true) ) { - return false; - } - // Try to do constant pool resolution if running Xcomp Bytecodes::Code call_bc = iter.cur_bc(); - if( !caller_method->check_call(index, call_bc == Bytecodes::_invokestatic) ) { - return false; + // An invokedynamic instruction does not have a klass. + if (call_bc != Bytecodes::_invokedynamic) { + int index = iter.get_index_int(); + if (!caller_method->is_klass_loaded(index, true)) { + return false; + } + // Try to do constant pool resolution if running Xcomp + if( !caller_method->check_call(index, call_bc == Bytecodes::_invokestatic) ) { + return false; + } } } // We will attempt to see if a class/field/etc got properly loaded. If it