src/share/vm/ci/ciStreams.cpp

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

*** 319,329 ****
  // ------------------------------------------------------------------
  // ciBytecodeStream::get_method
  //
  // If this is a method invocation bytecode, get the invoked method.
  ciMethod* ciBytecodeStream::get_method(bool& will_link) {
!   ciMethod* m = CURRENT_ENV->get_method_by_index(_holder, get_method_index(),cur_bc());
    will_link = m->is_loaded();
    return m;
  }
  
  // ------------------------------------------------------------------
--- 319,329 ----
  // ------------------------------------------------------------------
  // ciBytecodeStream::get_method
  //
  // If this is a method invocation bytecode, get the invoked method.
  ciMethod* ciBytecodeStream::get_method(bool& will_link) {
!   ciMethod* m = CURRENT_ENV->get_method_by_index(_holder, get_method_index(), cur_bc());
    will_link = m->is_loaded();
    return m;
  }
  
  // ------------------------------------------------------------------
*** 368,372 ****
--- 368,383 ----
    constantPoolOop cpool = _holder->get_instanceKlass()->constants();
    int method_index = get_method_index();
    int name_and_type_index = cpool->name_and_type_ref_index_at(method_index);
    return cpool->signature_ref_index_at(name_and_type_index);
  }
+ 
+ // ------------------------------------------------------------------
+ // ciBytecodeStream::get_cpcache
+ ciCPCache* ciBytecodeStream::get_cpcache() {
+   VM_ENTRY_MARK;
+   // Get the constant pool.
+   constantPoolOop      cpool   = _holder->get_instanceKlass()->constants();
+   constantPoolCacheOop cpcache = cpool->cache();
+ 
+   return CURRENT_ENV->get_object(cpcache)->as_cpcache();
+ }