--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp	Wed Aug 08 15:11:11 2018 -0400
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp	Wed Aug 08 15:24:21 2018 -0400
@@ -237,6 +237,9 @@
 #ifdef PRODUCT
   }
 #endif
+
+  // Clean up any metadata now unreferenced while MetadataOnStackMark is set.
+  ClassLoaderDataGraph::clean_deallocate_lists(false);
 }
 
 void VM_RedefineClasses::doit_epilogue() {