src/share/vm/interpreter/bytecode.cpp

rev 1081 : imported patch indy-cleanup-6893081.patch

*** 100,110 ****
  methodHandle Bytecode_invoke::static_target(TRAPS) {
    methodHandle m;
    KlassHandle resolved_klass;
    constantPoolHandle constants(THREAD, _method->constants());
  
!   if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
      LinkResolver::resolve_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
    } else {
      LinkResolver::resolve_interface_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
    }
    return m;
--- 100,112 ----
  methodHandle Bytecode_invoke::static_target(TRAPS) {
    methodHandle m;
    KlassHandle resolved_klass;
    constantPoolHandle constants(THREAD, _method->constants());
  
!   if (adjusted_invoke_code() == Bytecodes::_invokedynamic) {
!     LinkResolver::resolve_dynamic_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
!   } else if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
      LinkResolver::resolve_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
    } else {
      LinkResolver::resolve_interface_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
    }
    return m;