Print this page
rev 1081 : imported patch indy-cleanup-6893081.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/ci/ciStreams.cpp
          +++ new/src/share/vm/ci/ciStreams.cpp
↓ open down ↓ 331 lines elided ↑ open up ↑
 332  332  // Get the declared holder of the currently referenced method.
 333  333  //
 334  334  // Usage note: the holder() of a ciMethod class returns the canonical
 335  335  // holder of the method, rather than the holder declared in the
 336  336  // bytecodes.
 337  337  //
 338  338  // There is no "will_link" result passed back.  The user is responsible
 339  339  // for checking linkability when retrieving the associated method.
 340  340  ciKlass* ciBytecodeStream::get_declared_method_holder() {
 341  341    bool ignore;
 342      -  // report as Dynamic for invokedynamic, which is syntactically classless
      342 +  // report as InvokeDynamic for invokedynamic, which is syntactically classless
 343  343    if (cur_bc() == Bytecodes::_invokedynamic)
 344      -    return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_Dynamic(), false);
      344 +    return CURRENT_ENV->get_klass_by_name(_holder, ciSymbol::java_dyn_InvokeDynamic(), false);
 345  345    return CURRENT_ENV->get_klass_by_index(_holder, get_method_holder_index(), ignore);
 346  346  }
 347  347  
 348  348  // ------------------------------------------------------------------
 349  349  // ciBytecodeStream::get_method_holder_index
 350  350  //
 351  351  // Get the constant pool index of the declared holder of the method
 352  352  // referenced by the current bytecode.  Used for generating
 353  353  // deoptimization information.
 354  354  int ciBytecodeStream::get_method_holder_index() {
↓ open down ↓ 18 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX