src/hotspot/share/prims/jvmtiTagMap.cpp

*** 2836,2846 ****
  
      // get the java mirror
      oop mirror = klass->java_mirror();
  
      // super (only if something more interesting than java.lang.Object)
!     Klass* java_super = ik->java_super();
      if (java_super != NULL && java_super != SystemDictionary::Object_klass()) {
        oop super = java_super->java_mirror();
        if (!CallbackInvoker::report_superclass_reference(mirror, super)) {
          return false;
        }
--- 2836,2846 ----
  
      // get the java mirror
      oop mirror = klass->java_mirror();
  
      // super (only if something more interesting than java.lang.Object)
!     InstanceKlass* java_super = ik->java_super();
      if (java_super != NULL && java_super != SystemDictionary::Object_klass()) {
        oop super = java_super->java_mirror();
        if (!CallbackInvoker::report_superclass_reference(mirror, super)) {
          return false;
        }
*** 2892,2904 ****
      }
  
      // interfaces
      // (These will already have been reported as references from the constant pool
      //  but are specified by IterateOverReachableObjects and must be reported).
!     Array<Klass*>* interfaces = ik->local_interfaces();
      for (i = 0; i < interfaces->length(); i++) {
!       oop interf = ((Klass*)interfaces->at(i))->java_mirror();
        if (interf == NULL) {
          continue;
        }
        if (!CallbackInvoker::report_interface_reference(mirror, interf)) {
          return false;
--- 2892,2904 ----
      }
  
      // interfaces
      // (These will already have been reported as references from the constant pool
      //  but are specified by IterateOverReachableObjects and must be reported).
!     Array<InstanceKlass*>* interfaces = ik->local_interfaces();
      for (i = 0; i < interfaces->length(); i++) {
!       oop interf = interfaces->at(i)->java_mirror();
        if (interf == NULL) {
          continue;
        }
        if (!CallbackInvoker::report_interface_reference(mirror, interf)) {
          return false;