--- old/src/hotspot/share/classfile/classLoaderDataGraph.cpp	2018-11-05 13:20:34.380446624 +0100
+++ new/src/hotspot/share/classfile/classLoaderDataGraph.cpp	2018-11-05 13:20:33.954433491 +0100
@@ -496,11 +496,11 @@
 
 // Move class loader data from main list to the unloaded list for unloading
 // and deallocation later.
-bool ClassLoaderDataGraph::do_unloading(bool do_cleaning) {
+bool ClassLoaderDataGraph::do_unloading() {
   assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
 
   // Indicate whether safepoint cleanup is needed.
-  _safepoint_cleanup_needed |= do_cleaning;
+  _safepoint_cleanup_needed = true;
 
   ClassLoaderData* data = _head;
   ClassLoaderData* prev = NULL;