--- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp	Fri Dec 07 13:59:19 2018 -0500
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp	Fri Dec 07 14:48:35 2018 -0500
@@ -165,7 +165,7 @@
 }
 
 inline void G1FullGCMarker::follow_klass(Klass* k) {
-  oop op = k->klass_holder();
+  oop op = k->class_loader_data()->holder_no_keepalive();
   mark_and_push(&op);
 }