--- old/src/hotspot/share/oops/instanceKlass.cpp	2020-02-27 21:52:23.026180122 -0800
+++ new/src/hotspot/share/oops/instanceKlass.cpp	2020-02-27 21:52:22.383154894 -0800
@@ -2473,7 +2473,7 @@
 
 // returns true IFF is_in_error_state() has been changed as a result of this call.
 bool InstanceKlass::check_sharing_error_state() {
-  assert(DumpSharedSpaces, "should only be called during dumping");
+  Arguments::assert_is_dumping_archive();
   bool old_state = is_in_error_state();
 
   if (!is_in_error_state()) {
@@ -3576,9 +3576,7 @@
             "this class isn't found in class loader data");
 
   // Verify vtables
-  if (is_linked()) {
-    // $$$ This used to be done only for m/s collections.  Doing it
-    // always seemed a valid generalization.  (DLD -- 6/00)
+  if (is_linked() && !is_in_error_state()) {
     vtable().verify(st);
   }