--- old/src/share/vm/memory/metaspaceTracer.cpp	2019-02-15 19:02:34.206945922 +0300
+++ new/src/share/vm/memory/metaspaceTracer.cpp	2019-02-15 19:02:34.102949557 +0300
@@ -24,10 +24,9 @@
 
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "memory/metaspaceTracer.hpp"
 #include "oops/oop.inline.hpp"
-#include "trace/tracing.hpp"
-#include "trace/traceBackend.hpp"
 
 void MetaspaceTracer::report_gc_threshold(size_t old_val,
                                           size_t new_val,
@@ -67,9 +66,9 @@
       event.set_anonymousClassLoader(true);
     } else {
       if (cld->is_the_null_class_loader_data()) {
-        event.set_classLoader((Klass*) NULL);
+        event.set_classLoader(NULL);
       } else {
-        event.set_classLoader(cld->class_loader()->klass());
+        event.set_classLoader(cld);
       }
       event.set_anonymousClassLoader(false);
     }