src/hotspot/cpu/s390/c1_Runtime1_s390.cpp

*** 766,776 ****
  
  #if INCLUDE_ALL_GCS
      case g1_pre_barrier_slow_id:
        { // Z_R1_scratch: previous value of memory
  
!         BarrierSet* bs = Universe::heap()->barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ should_not_reach_here(FILE_AND_LINE);
            break;
          }
  
--- 766,776 ----
  
  #if INCLUDE_ALL_GCS
      case g1_pre_barrier_slow_id:
        { // Z_R1_scratch: previous value of memory
  
!         BarrierSet* bs = BarrierSet::barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ should_not_reach_here(FILE_AND_LINE);
            break;
          }
  
*** 829,839 ****
        }
        break;
  
      case g1_post_barrier_slow_id:
        { // Z_R1_scratch: oop address, address of updated memory slot
!         BarrierSet* bs = Universe::heap()->barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ should_not_reach_here(FILE_AND_LINE);
            break;
          }
  
--- 829,839 ----
        }
        break;
  
      case g1_post_barrier_slow_id:
        { // Z_R1_scratch: oop address, address of updated memory slot
!         BarrierSet* bs = BarrierSet::barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ should_not_reach_here(FILE_AND_LINE);
            break;
          }