--- old/src/hotspot/share/opto/compile.cpp	2018-11-07 22:36:33.534261535 +0100
+++ new/src/hotspot/share/opto/compile.cpp	2018-11-07 22:36:33.373262493 +0100
@@ -2792,7 +2792,7 @@
   }
 #endif
   // Count FPU ops and common calls, implements item (3)
-  bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->final_graph_reshaping(this, n);
+  bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->final_graph_reshaping(this, n, nop);
   switch( nop ) {
   // Count all float operations that may use FPU
   case Op_AddF:
@@ -2939,10 +2939,6 @@
   case Op_LoadL_unaligned:
   case Op_LoadPLocked:
   case Op_LoadP:
-#if INCLUDE_ZGC
-  case Op_LoadBarrierSlowReg:
-  case Op_LoadBarrierWeakSlowReg:
-#endif
   case Op_LoadN:
   case Op_LoadRange:
   case Op_LoadS: {