*** old/src/hotspot/share/classfile/klassFactory.cpp	Tue Jun 19 09:43:33 2018
--- new/src/hotspot/share/classfile/klassFactory.cpp	Tue Jun 19 09:43:33 2018

*** 236,246 ****
--- 236,250 ----
  
  #if INCLUDE_CDS
    if (DumpSharedSpaces) {
      ClassLoader::record_result(result, stream, THREAD);
  #if INCLUDE_JVMTI
+     // JFR will redefine some classes during startup.
+     // cached_class_file will not be NULL for those redefined classes.
+     if (strcmp(stream->source(), "__VM_RedefineClasses__") != 0) {
        assert(cached_class_file == NULL, "Sanity");
+     }
      // Archive the class stream data into the optional data section
      JvmtiCachedClassFileData *p;
      int len;
      const unsigned char *bytes;
      // event based tracing might set cached_class_file