--- a/hotspot/src/share/vm/oops/klass.cpp	Tue Apr 25 18:56:45 2017 +0000
+++ b/hotspot/src/share/vm/oops/klass.cpp	Fri Apr 14 08:33:57 2017 -0700
@@ -497,10 +497,12 @@
 
   // Null out class_loader_data because we don't share that yet.
   set_class_loader_data(NULL);
+  set_is_shared();
 }
 
 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
   assert(is_klass(), "ensure C++ vtable is restored");
+  assert(is_shared(), "must be set");
   TRACE_RESTORE_ID(this);
 
   // If an exception happened during CDS restore, some of these fields may already be