diff -r 01a5c5fa5681 -r 2fd2fdc6a70a hotspot/src/share/vm/oops/instanceKlass.cpp
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Fri May 15 19:23:11 2015 +0300
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Thu May 21 18:22:33 2015 +0300
@@ -2032,7 +2032,6 @@
 }
 
 void InstanceKlass::remove_unshareable_info() {
-  Klass::remove_unshareable_info();
   // Unlink the class
   if (is_linked()) {
     unlink_class();
@@ -2048,6 +2047,8 @@
 
   // do array classes also.
   array_klasses_do(remove_unshareable_in_class);
+
+  Klass::remove_unshareable_info();
 }
 
 static void restore_unshareable_in_class(Klass* k, TRAPS) {
@@ -3512,3 +3513,11 @@
 unsigned char * InstanceKlass::get_cached_class_file_bytes() {
   return VM_RedefineClasses::get_cached_class_file_bytes(_cached_class_file);
 }
+
+objArrayOop InstanceKlass::resolved_references() const {
+  return java_lang_Class::resolved_references(java_mirror());
+}
+
+void InstanceKlass::set_resolved_references(objArrayOop obj_arr) {
+  return java_lang_Class::set_resolved_references(java_mirror(), obj_arr);
+}