src/hotspot/share/oops/klass.cpp

*** 57,66 ****
--- 57,70 ----
  
  oop Klass::java_mirror() const {
    return _java_mirror.resolve();
  }
  
+ oop Klass::java_mirror_no_keepalive() const {
+   return _java_mirror.peek();
+ }
+ 
  bool Klass::is_cloneable() const {
    return _access_flags.is_cloneable_fast() ||
           is_subtype_of(SystemDictionary::Cloneable_klass());
  }
  
***************
*** 744,755 ****
      if (ko != NULL) {
        guarantee(ko->is_klass(), "should be klass");
      }
    }
  
!   if (java_mirror() != NULL) {
!     guarantee(oopDesc::is_oop(java_mirror()), "should be instance");
    }
  }
  
  void Klass::oop_verify_on(oop obj, outputStream* st) {
    guarantee(oopDesc::is_oop(obj),  "should be oop");
--- 748,759 ----
      if (ko != NULL) {
        guarantee(ko->is_klass(), "should be klass");
      }
    }
  
!   if (java_mirror_no_keepalive() != NULL) {
!     guarantee(oopDesc::is_oop(java_mirror_no_keepalive()), "should be instance");
    }
  }
  
  void Klass::oop_verify_on(oop obj, outputStream* st) {
    guarantee(oopDesc::is_oop(obj),  "should be oop");