--- a/src/hotspot/share/opto/classes.hpp	Thu Apr 04 07:43:44 2019 -0700
+++ b/src/hotspot/share/opto/classes.hpp	Tue Apr 02 23:00:22 2019 +0200
@@ -281,9 +281,7 @@
 shmacro(ShenandoahWeakCompareAndSwapN)
 shmacro(ShenandoahWeakCompareAndSwapP)
 shmacro(ShenandoahEnqueueBarrier)
-shmacro(ShenandoahReadBarrier)
-shmacro(ShenandoahWriteBarrier)
-shmacro(ShenandoahWBMemProj)
+shmacro(ShenandoahLoadReferenceBarrier)
 macro(SCMemProj)
 macro(SqrtD)
 macro(SqrtF)