src/share/vm/ci/ciInstanceKlass.cpp

*** 83,93 ****
  
    if (is_shared()) {
      if (h_k() != SystemDictionary::Object_klass()) {
        super();
      }
-     java_mirror();
      //compute_nonstatic_fields();  // done outside of constructor
    }
  
    _field_cache = NULL;
  }
--- 83,92 ----
*** 318,327 ****
--- 317,329 ----
  // ciInstanceKlass::java_mirror
  //
  // Get the instance of java.lang.Class corresponding to this klass.
  // Cache it on this->_java_mirror.
  ciInstance* ciInstanceKlass::java_mirror() {
+   if (is_shared()) {
+     return ciKlass::java_mirror();
+   }
    if (_java_mirror == NULL) {
      _java_mirror = ciKlass::java_mirror();
    }
    return _java_mirror;
  }