--- a/src/hotspot/share/classfile/classLoader.inline.hpp	Mon Nov 25 14:06:13 2019 +0100
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp	Mon Nov 25 12:22:13 2019 +0100
@@ -29,11 +29,11 @@
 #include "runtime/orderAccess.hpp"
 
 // Next entry in class path
-inline ClassPathEntry* ClassPathEntry::next() const { return OrderAccess::load_acquire(&_next); }
+inline ClassPathEntry* ClassPathEntry::next() const { return Atomic::load_acquire(&_next); }
 
 inline void ClassPathEntry::set_next(ClassPathEntry* next) {
   // may have unlocked readers, so ensure visibility.
-  OrderAccess::release_store(&_next, next);
+  Atomic::release_store(&_next, next);
 }
 
 inline ClassPathEntry* ClassLoader::classpath_entry(int n) {