--- a/src/share/vm/oops/klass.cpp	Fri Feb 24 18:30:42 2012 -0800
+++ b/src/share/vm/oops/klass.cpp	Mon Feb 27 13:10:13 2012 +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);
@@ -159,6 +159,7 @@
   kl->set_next_sibling(NULL);
   kl->set_alloc_count(0);
   kl->set_alloc_size(0);
+  TRACE_SET_KLASS_TRACE_ID(kl, 0);
 
   kl->set_prototype_header(markOopDesc::prototype());
   kl->set_biased_lock_revocation_count(0);