--- a/hotspot/src/share/vm/classfile/javaClasses.cpp	Fri May 29 12:49:31 2015 +0200
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp	Fri May 29 17:04:21 2015 +0300
@@ -567,12 +567,6 @@
     }
   }
   create_mirror(k, Handle(NULL), Handle(NULL), CHECK);
-
-  if (UseSharedSpaces && k->oop_is_instance()) {
-    // Create resolved_references array in the fresh mirror.
-    instanceKlassHandle ik(k());
-    ik->constants()->restore_unshareable_info(CHECK);
-  }
 }
 
 void java_lang_Class::initialize_mirror_fields(KlassHandle k,
@@ -930,17 +924,6 @@
   the_class_mirror->int_field_put(classRedefinedCount_offset, value);
 }
 
-objArrayOop java_lang_Class::resolved_references(oop java_class) {
-  assert(java_lang_Class::is_instance(java_class), "");
-  assert(resolvedReferences_offset > 0, "must be set");
-  return objArrayOop(java_class->obj_field(resolvedReferences_offset));
-}
-
-void java_lang_Class::set_resolved_references(oop java_class, objArrayOop a) {
-  assert(java_lang_Class::is_instance(java_class), "");
-  assert(resolvedReferences_offset > 0, "must be set");
-  java_class->obj_field_put(resolvedReferences_offset, a);
-}
 
 // Note: JDK1.1 and before had a privateInfo_offset field which was used for the
 //       platform thread structure, and a eetop offset which was used for thread
@@ -3198,7 +3181,6 @@
   }
 }
 
-int java_lang_Class::resolvedReferences_offset;
 int java_lang_Class::_klass_offset;
 int java_lang_Class::_array_klass_offset;
 int java_lang_Class::_oop_size_offset;
@@ -3354,9 +3336,6 @@
   const int x = heapOopSize;
   const int header = instanceOopDesc::base_offset_in_bytes();
 
-  // Class
-  java_lang_Class::resolvedReferences_offset = java_lang_Class::hc_resolvedReferences_offset * x + header;
-
   // Throwable Class
   java_lang_Throwable::backtrace_offset  = java_lang_Throwable::hc_backtrace_offset  * x + header;
   java_lang_Throwable::detailMessage_offset = java_lang_Throwable::hc_detailMessage_offset * x + header;
@@ -3555,7 +3534,9 @@
 
   // java.lang.Class
 
-  CHECK_OFFSET("java/lang/Class", java_lang_Class, resolvedReferences, "[Ljava/lang/Object;");
+  // Fake fields
+  // CHECK_OFFSET("java/lang/Class", java_lang_Class, klass); // %%% this needs to be checked
+  // CHECK_OFFSET("java/lang/Class", java_lang_Class, array_klass); // %%% this needs to be checked
 
   // java.lang.Throwable