src/hotspot/cpu/s390/macroAssembler_s390.cpp

*** 3497,3507 ****
    // flag == EQ indicates success
    // flag == NE indicates failure
  }
  
  void MacroAssembler::resolve_jobject(Register value, Register tmp1, Register tmp2) {
!   BarrierSetAssembler* bs = Universe::heap()->barrier_set()->barrier_set_assembler();
    bs->resolve_jobject(this, value, tmp1, tmp2);
  }
  
  // Last_Java_sp must comply to the rules in frame_s390.hpp.
  void MacroAssembler::set_last_Java_frame(Register last_Java_sp, Register last_Java_pc, bool allow_relocation) {
--- 3497,3507 ----
    // flag == EQ indicates success
    // flag == NE indicates failure
  }
  
  void MacroAssembler::resolve_jobject(Register value, Register tmp1, Register tmp2) {
!   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
    bs->resolve_jobject(this, value, tmp1, tmp2);
  }
  
  // Last_Java_sp must comply to the rules in frame_s390.hpp.
  void MacroAssembler::set_last_Java_frame(Register last_Java_sp, Register last_Java_pc, bool allow_relocation) {