--- a/src/hotspot/share/runtime/vmStructs.cpp Wed Apr 18 10:30:57 2018 -0700
+++ b/src/hotspot/share/runtime/vmStructs.cpp Wed Apr 18 18:43:04 2018 -0400
@@ -543,7 +543,7 @@
/*******************/ \
/* ClassLoaderData */ \
/*******************/ \
- nonstatic_field(ClassLoaderData, _class_loader, oop) \
+ nonstatic_field(ClassLoaderData, _class_loader, OopHandle) \
nonstatic_field(ClassLoaderData, _next, ClassLoaderData*) \
volatile_nonstatic_field(ClassLoaderData, _klasses, Klass*) \
nonstatic_field(ClassLoaderData, _is_anonymous, bool) \