From ec4c0637f85f1883b6e28f5765eff0bb87879115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Lid=C3=A9n?= <pliden@openjdk.org>
Date: Fri, 15 Jun 2018 13:31:50 +0200
Subject: [PATCH] 8205050: ZGC: Incorrect use of RootAccess in ZHeapIterator

Reviewed-by: stefank, eosterlund
---
 src/hotspot/share/gc/z/zHeapIterator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index 03c4e16cfbb..4c5bde58c36 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -63,7 +63,7 @@ public:
   virtual void do_oop(oop* p) {
     // Load barrier needed here for the same reason we
     // need fixup_partial_loads() in ZHeap::mark_end()
-    const oop obj = RootAccess<>::oop_load(p);
+    const oop obj = ZBarrier::load_barrier_on_oop_field(p);
     _iter->push(obj);
     _iter->drain(_cl);
   }