Print this page
rev 1081 : imported patch indy-cleanup-6893081.patch
rev 1082 : [mq]: indy.compiler.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/ci/ciStreams.cpp
          +++ new/src/share/vm/ci/ciStreams.cpp
↓ open down ↓ 313 lines elided ↑ open up ↑
 314  314    }
 315  315  #endif
 316  316    return get_index_int();
 317  317  }
 318  318  
 319  319  // ------------------------------------------------------------------
 320  320  // ciBytecodeStream::get_method
 321  321  //
 322  322  // If this is a method invocation bytecode, get the invoked method.
 323  323  ciMethod* ciBytecodeStream::get_method(bool& will_link) {
 324      -  ciMethod* m = CURRENT_ENV->get_method_by_index(_holder, get_method_index(),cur_bc());
      324 +  ciMethod* m = CURRENT_ENV->get_method_by_index(_holder, get_method_index(), cur_bc());
 325  325    will_link = m->is_loaded();
 326  326    return m;
 327  327  }
 328  328  
 329  329  // ------------------------------------------------------------------
 330  330  // ciBytecodeStream::get_declared_method_holder
 331  331  //
 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
↓ open down ↓ 28 lines elided ↑ open up ↑
 363  363  // Get the constant pool index of the signature of the method
 364  364  // referenced by the current bytecode.  Used for generating
 365  365  // deoptimization information.
 366  366  int ciBytecodeStream::get_method_signature_index() {
 367  367    VM_ENTRY_MARK;
 368  368    constantPoolOop cpool = _holder->get_instanceKlass()->constants();
 369  369    int method_index = get_method_index();
 370  370    int name_and_type_index = cpool->name_and_type_ref_index_at(method_index);
 371  371    return cpool->signature_ref_index_at(name_and_type_index);
 372  372  }
      373 +
      374 +// ------------------------------------------------------------------
      375 +// ciBytecodeStream::get_cpcache
      376 +ciCPCache* ciBytecodeStream::get_cpcache() {
      377 +  VM_ENTRY_MARK;
      378 +  // Get the constant pool.
      379 +  constantPoolOop      cpool   = _holder->get_instanceKlass()->constants();
      380 +  constantPoolCacheOop cpcache = cpool->cache();
      381 +
      382 +  return CURRENT_ENV->get_object(cpcache)->as_cpcache();
      383 +}
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX