--- a/src/hotspot/share/classfile/classLoaderData.cpp	Fri Jun 15 13:08:32 2018 -0700
+++ b/src/hotspot/share/classfile/classLoaderData.cpp	Fri Jun 15 16:53:58 2018 -0400
@@ -815,7 +815,7 @@
     assert(_handles.owner_of(ptr), "Got unexpected handle " PTR_FORMAT, p2i(ptr));
     // This root is not walked in safepoints, and hence requires an appropriate
     // decorator that e.g. maintains the SATB invariant in SATB collectors.
-    RootAccess<IN_CONCURRENT_ROOT>::oop_store(ptr, oop(NULL));
+    NativeAccess<IN_CONCURRENT_ROOT>::oop_store(ptr, oop(NULL));
   }
 }