src/share/vm/interpreter/interpreterRuntime.cpp

*** 116,126 ****
    int index = wide ? get_index_u2(thread, Bytecodes::_ldc_w) : get_index_u1(thread, Bytecodes::_ldc);
    constantTag tag = pool->tag_at(index);
  
    if (tag.is_unresolved_klass() || tag.is_klass()) {
      klassOop klass = pool->klass_at(index, CHECK);
!     oop java_class = klass->klass_part()->java_mirror();
      thread->set_vm_result(java_class);
    } else {
  #ifdef ASSERT
      // If we entered this runtime routine, we believed the tag contained
      // an unresolved string, an unresolved class or a resolved class.
--- 116,126 ----
    int index = wide ? get_index_u2(thread, Bytecodes::_ldc_w) : get_index_u1(thread, Bytecodes::_ldc);
    constantTag tag = pool->tag_at(index);
  
    if (tag.is_unresolved_klass() || tag.is_klass()) {
      klassOop klass = pool->klass_at(index, CHECK);
!     oop java_class = klass->java_mirror();
      thread->set_vm_result(java_class);
    } else {
  #ifdef ASSERT
      // If we entered this runtime routine, we believed the tag contained
      // an unresolved string, an unresolved class or a resolved class.
*** 981,991 ****
  
  IRT_ENTRY(void, InterpreterRuntime::post_field_access(JavaThread *thread, oopDesc* obj,
  ConstantPoolCacheEntry *cp_entry))
  
    // check the access_flags for the field in the klass
!   instanceKlass* ik = instanceKlass::cast((klassOop)cp_entry->f1());
    typeArrayOop fields = ik->fields();
    int index = cp_entry->field_index();
    assert(index < fields->length(), "holders field index is out of range");
    // bail out if field accesses are not watched
    if ((fields->ushort_at(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return;
--- 981,992 ----
  
  IRT_ENTRY(void, InterpreterRuntime::post_field_access(JavaThread *thread, oopDesc* obj,
  ConstantPoolCacheEntry *cp_entry))
  
    // check the access_flags for the field in the klass
! 
!   instanceKlass* ik = instanceKlass::cast(java_lang_Class::as_klassOop(cp_entry->f1()));
    typeArrayOop fields = ik->fields();
    int index = cp_entry->field_index();
    assert(index < fields->length(), "holders field index is out of range");
    // bail out if field accesses are not watched
    if ((fields->ushort_at(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return;
*** 1007,1025 ****
    Handle h_obj;
    if (!is_static) {
      // non-static field accessors have an object, but we need a handle
      h_obj = Handle(thread, obj);
    }
!   instanceKlassHandle h_cp_entry_f1(thread, (klassOop)cp_entry->f1());
    jfieldID fid = jfieldIDWorkaround::to_jfieldID(h_cp_entry_f1, cp_entry->f2(), is_static);
    JvmtiExport::post_field_access(thread, method(thread), bcp(thread), h_cp_entry_f1, h_obj, fid);
  IRT_END
  
  IRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread,
    oopDesc* obj, ConstantPoolCacheEntry *cp_entry, jvalue *value))
  
!   klassOop k = (klassOop)cp_entry->f1();
  
    // check the access_flags for the field in the klass
    instanceKlass* ik = instanceKlass::cast(k);
    typeArrayOop fields = ik->fields();
    int index = cp_entry->field_index();
--- 1008,1026 ----
    Handle h_obj;
    if (!is_static) {
      // non-static field accessors have an object, but we need a handle
      h_obj = Handle(thread, obj);
    }
!   instanceKlassHandle h_cp_entry_f1(thread, java_lang_Class::as_klassOop(cp_entry->f1()));
    jfieldID fid = jfieldIDWorkaround::to_jfieldID(h_cp_entry_f1, cp_entry->f2(), is_static);
    JvmtiExport::post_field_access(thread, method(thread), bcp(thread), h_cp_entry_f1, h_obj, fid);
  IRT_END
  
  IRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread,
    oopDesc* obj, ConstantPoolCacheEntry *cp_entry, jvalue *value))
  
!   klassOop k = java_lang_Class::as_klassOop(cp_entry->f1());
  
    // check the access_flags for the field in the klass
    instanceKlass* ik = instanceKlass::cast(k);
    typeArrayOop fields = ik->fields();
    int index = cp_entry->field_index();