src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp

*** 510,520 ****
    //  If the receiver is null then it is OK to jump to the slow path.
    __ load_and_test_long(pre_val, Address(Rargp, Interpreter::stackElementSize)); // Get receiver.
    __ z_bre(slow_path);
  
    //  Load the value of the referent field.
!  BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
   bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT,
                     Address(pre_val, referent_offset), pre_val, scratch1, scratch2);
  
    // Restore caller sp for c2i case.
    __ resize_frame_absolute(Z_R10, Z_R0, true); // Cut the stack back to where the caller started.
--- 510,520 ----
    //  If the receiver is null then it is OK to jump to the slow path.
    __ load_and_test_long(pre_val, Address(Rargp, Interpreter::stackElementSize)); // Get receiver.
    __ z_bre(slow_path);
  
    //  Load the value of the referent field.
!  BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT,
                     Address(pre_val, referent_offset), pre_val, scratch1, scratch2);
  
    // Restore caller sp for c2i case.
    __ resize_frame_absolute(Z_R10, Z_R0, true); // Cut the stack back to where the caller started.