--- a/hotspot/src/share/vm/oops/klass.cpp	Mon Jun 20 17:38:14 2016 +0000
+++ b/hotspot/src/share/vm/oops/klass.cpp	Mon Jun 20 22:02:20 2016 -0700
@@ -482,6 +482,7 @@
 
 void Klass::remove_unshareable_info() {
   assert (DumpSharedSpaces, "only called for DumpSharedSpaces");
+  TRACE_REMOVE_KLASS_ID(this);
 
   set_subklass(NULL);
   set_next_sibling(NULL);
@@ -494,7 +495,8 @@
 }
 
 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
-  TRACE_INIT_KLASS_ID(this);
+  TRACE_RESTORE_KLASS_ID(this);
+
   // If an exception happened during CDS restore, some of these fields may already be
   // set.  We leave the class on the CLD list, even if incomplete so that we don't
   // modify the CLD list outside a safepoint.