--- a/src/hotspot/share/classfile/dictionary.cpp	Wed Dec 05 15:39:04 2018 +0530
+++ b/src/hotspot/share/classfile/dictionary.cpp	Wed Dec 05 08:55:42 2018 +0100
@@ -235,7 +235,7 @@
 
 
 void Dictionary::do_unloading() {
-  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
+  assert_locked_or_safepoint(SystemDictionary_lock);
 
   // The NULL class loader doesn't initiate loading classes from other class loaders
   if (loader_data() == ClassLoaderData::the_null_class_loader_data()) {