src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp

*** 211,14 ***
      access.set_barrier_data(G1C2BarrierPre);
    }
    return CardTableBarrierSetC2::load_at_resolved(access, val_type);
  }
  
! void G1BarrierSetC2::eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const {
    eliminate_gc_barrier_data(node);
  }
- 
  void G1BarrierSetC2::eliminate_gc_barrier_data(Node* node) const {
    if (node->is_LoadStore()) {
      LoadStoreNode* loadstore = node->as_LoadStore();
      loadstore->set_barrier_data(0);
    } else if (node->is_Mem()) {
--- 211,13 ---
      access.set_barrier_data(G1C2BarrierPre);
    }
    return CardTableBarrierSetC2::load_at_resolved(access, val_type);
  }
  
! void G1BarrierSetC2::eliminate_gc_barrier(PhaseIterGVN* igvn, Node* node) const {
    eliminate_gc_barrier_data(node);
  }
  void G1BarrierSetC2::eliminate_gc_barrier_data(Node* node) const {
    if (node->is_LoadStore()) {
      LoadStoreNode* loadstore = node->as_LoadStore();
      loadstore->set_barrier_data(0);
    } else if (node->is_Mem()) {