--- old/src/share/vm/oops/klass.cpp	2017-02-28 17:55:14.132141874 -0800
+++ new/src/share/vm/oops/klass.cpp	2017-02-28 17:55:13.972135875 -0800
@@ -501,6 +501,7 @@
 }
 
 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
+  assert(is_klass(), "ensure C++ vtable is restored");
   TRACE_RESTORE_ID(this);
 
   // If an exception happened during CDS restore, some of these fields may already be