src/hotspot/share/opto/compile.cpp

*** 2790,2800 ****
        assert(mb->trailing_membar()->leading_membar() == mb, "bad membar pair");
      }
    }
  #endif
    // Count FPU ops and common calls, implements item (3)
!   bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->final_graph_reshaping(this, n);
    switch( nop ) {
    // Count all float operations that may use FPU
    case Op_AddF:
    case Op_SubF:
    case Op_MulF:
--- 2790,2800 ----
        assert(mb->trailing_membar()->leading_membar() == mb, "bad membar pair");
      }
    }
  #endif
    // Count FPU ops and common calls, implements item (3)
!   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:
    case Op_SubF:
    case Op_MulF:
*** 2937,2950 ****
    case Op_LoadNKlass:
    case Op_LoadL:
    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: {
    handle_mem:
  #ifdef ASSERT
--- 2937,2946 ----