src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp

*** 1105,1115 ****
      case g1_pre_barrier_slow_id:
        {
          StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
          // arg0 : previous value of memory
  
!         BarrierSet* bs = Universe::heap()->barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ mov(r0, (int)id);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);
            __ should_not_reach_here();
            break;
--- 1105,1115 ----
      case g1_pre_barrier_slow_id:
        {
          StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
          // arg0 : previous value of memory
  
!         BarrierSet* bs = BarrierSet::barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ mov(r0, (int)id);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);
            __ should_not_reach_here();
            break;
*** 1157,1167 ****
        break;
      case g1_post_barrier_slow_id:
        {
          StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
  
!         BarrierSet* bs = Universe::heap()->barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ mov(r0, (int)id);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);
            __ should_not_reach_here();
            break;
--- 1157,1167 ----
        break;
      case g1_post_barrier_slow_id:
        {
          StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
  
!         BarrierSet* bs = BarrierSet::barrier_set();
          if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ mov(r0, (int)id);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);
            __ should_not_reach_here();
            break;