src/share/vm/ci/ciStreams.cpp

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

*** 337,349 ****
  //
  // There is no "will_link" result passed back.  The user is responsible
  // for checking linkability when retrieving the associated method.
  ciKlass* ciBytecodeStream::get_declared_method_holder() {
    bool ignore;
!   // report as Dynamic for invokedynamic, which is syntactically classless
    if (cur_bc() == Bytecodes::_invokedynamic)
!     return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_Dynamic(), false);
    return CURRENT_ENV->get_klass_by_index(_holder, get_method_holder_index(), ignore);
  }
  
  // ------------------------------------------------------------------
  // ciBytecodeStream::get_method_holder_index
--- 337,349 ----
  //
  // There is no "will_link" result passed back.  The user is responsible
  // for checking linkability when retrieving the associated method.
  ciKlass* ciBytecodeStream::get_declared_method_holder() {
    bool ignore;
!   // report as InvokeDynamic for invokedynamic, which is syntactically classless
    if (cur_bc() == Bytecodes::_invokedynamic)
!     return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_InvokeDynamic(), false);
    return CURRENT_ENV->get_klass_by_index(_holder, get_method_holder_index(), ignore);
  }
  
  // ------------------------------------------------------------------
  // ciBytecodeStream::get_method_holder_index