--- a/hotspot/src/share/vm/oops/klass.cpp	Tue Dec 20 00:55:02 2011 -0800
+++ b/hotspot/src/share/vm/oops/klass.cpp	Wed Dec 07 11:35:03 2011 +0100
@@ -144,7 +144,7 @@
     }
     kl->set_secondary_supers(NULL);
     oop_store_without_check((oop*) &kl->_primary_supers[0], k);
-    kl->set_super_check_offset(primary_supers_offset_in_bytes() + sizeof(oopDesc));
+    kl->set_super_check_offset(in_bytes(primary_supers_offset()));
   }
 
   kl->set_java_mirror(NULL);