--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java	Thu Oct 04 16:39:07 2018 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java	Thu Oct 04 08:45:21 2018 -0700
@@ -70,7 +70,7 @@
         endClass();
         byte[] bytes = classWriter.toByteArray();
         ASMToolkit.logASM(fullClassName, bytes);
-        return SecuritySupport.defineClass(type.getInternalName(), bytes, Event.class.getClassLoader()).asSubclass(Event.class);
+        return SecuritySupport.defineClass(Event.class, bytes).asSubclass(Event.class);
     }
 
     private void endClass() {