--- old/src/hotspot/share/oops/weakHandle.inline.hpp	2018-06-13 04:31:22.532737820 -0400
+++ new/src/hotspot/share/oops/weakHandle.inline.hpp	2018-06-13 04:31:22.220721442 -0400
@@ -31,18 +31,18 @@
 template <WeakHandleType T>
 oop WeakHandle<T>::resolve() const {
   assert(!is_null(), "Must be created");
-  return RootAccess<ON_PHANTOM_OOP_REF>::oop_load(_obj);
+  return NativeAccess<ON_PHANTOM_OOP_REF>::oop_load(_obj);
 }
 
 template <WeakHandleType T>
 oop WeakHandle<T>::peek() const {
   assert(!is_null(), "Must be created");
-  return RootAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(_obj);
+  return NativeAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(_obj);
 }
 
 template <WeakHandleType T>
 void WeakHandle<T>::replace(oop with_obj) {
-  RootAccess<ON_PHANTOM_OOP_REF>::oop_store(_obj, with_obj);
+  NativeAccess<ON_PHANTOM_OOP_REF>::oop_store(_obj, with_obj);
 }
 
 #endif // SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP