--- old/src/hotspot/share/gc/z/zBarrier.hpp	2018-03-15 14:50:44.748729846 +0100
+++ new/src/hotspot/share/gc/z/zBarrier.hpp	2018-03-15 14:50:44.469717853 +0100
@@ -40,7 +40,7 @@
 
   template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static oop barrier(volatile oop* p, oop o);
   template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static oop weak_barrier(volatile oop* p, oop o);
-  template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static void root_barrier(volatile oop* p, oop o);
+  template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path> static void root_barrier(oop* p, oop o);
 
   static bool is_null_fast_path(uintptr_t addr);
   static bool is_good_or_null_fast_path(uintptr_t addr);
@@ -102,10 +102,10 @@
   // Mark barrier
   static void mark_barrier_on_oop_field(volatile oop* p, bool finalizable);
   static void mark_barrier_on_oop_array(volatile oop* p, size_t length, bool finalizable);
-  static void mark_barrier_on_root_oop_field(volatile oop* p);
+  static void mark_barrier_on_root_oop_field(oop* p);
 
   // Relocate barrier
-  static void relocate_barrier_on_root_oop_field(volatile oop* p);
+  static void relocate_barrier_on_root_oop_field(oop* p);
 
   // Narrow oop variants, never used.
   static oop  load_barrier_on_oop_field(volatile narrowOop* p);
--- old/src/hotspot/share/gc/z/zBarrier.inline.hpp	2018-03-15 14:50:45.364756325 +0100
+++ new/src/hotspot/share/gc/z/zBarrier.inline.hpp	2018-03-15 14:50:45.077743988 +0100
@@ -99,7 +99,7 @@
 }
 
 template <ZBarrierFastPath fast_path, ZBarrierSlowPath slow_path>
-inline void ZBarrier::root_barrier(volatile oop* p, oop o) {
+inline void ZBarrier::root_barrier(oop* p, oop o) {
   const uintptr_t addr = ZOop::to_address(o);
 
   // Fast path
@@ -281,7 +281,7 @@
   }
 }
 
-inline void ZBarrier::mark_barrier_on_root_oop_field(volatile oop* p) {
+inline void ZBarrier::mark_barrier_on_root_oop_field(oop* p) {
   const oop o = *p;
   root_barrier<is_good_or_null_fast_path, mark_barrier_on_root_oop_slow_path>(p, o);
 }
@@ -289,7 +289,7 @@
 //
 // Relocate barrier
 //
-inline void ZBarrier::relocate_barrier_on_root_oop_field(volatile oop* p) {
+inline void ZBarrier::relocate_barrier_on_root_oop_field(oop* p) {
   const oop o = *p;
   root_barrier<is_good_or_null_fast_path, relocate_barrier_on_root_oop_slow_path>(p, o);
 }