src/cpu/s390/vm/c1_CodeStubs_s390.cpp

*** 471,481 ****
      ce->mem2reg(addr(), pre_val(), T_OBJECT, patch_code(), info(), false /*wide*/, false /*unaligned*/);
    }
  
    __ z_ltgr(Z_R1_scratch, pre_val_reg); // Pass oop in Z_R1_scratch to Runtime1::g1_pre_barrier_slow_id.
    __ branch_optimized(Assembler::bcondZero, _continuation);
!   ce->emit_call_c(Runtime1::entry_for (Runtime1::g1_pre_barrier_slow_id));
    CHECK_BAILOUT();
    __ branch_optimized(Assembler::bcondAlways, _continuation);
  }
  
  void G1PostBarrierStub::emit_code(LIR_Assembler* ce) {
--- 471,482 ----
      ce->mem2reg(addr(), pre_val(), T_OBJECT, patch_code(), info(), false /*wide*/, false /*unaligned*/);
    }
  
    __ z_ltgr(Z_R1_scratch, pre_val_reg); // Pass oop in Z_R1_scratch to Runtime1::g1_pre_barrier_slow_id.
    __ branch_optimized(Assembler::bcondZero, _continuation);
!   Runtime1::StubID id = patch_code() == lir_patch_none ? Runtime1::g1_pre_barrier_slow_id : Runtime1::g1_pre_barrier_slow_with_recheck_id;
!   ce->emit_call_c(Runtime1::entry_for(id));
    CHECK_BAILOUT();
    __ branch_optimized(Assembler::bcondAlways, _continuation);
  }
  
  void G1PostBarrierStub::emit_code(LIR_Assembler* ce) {