src/hotspot/share/opto/compile.cpp

@@ -416,12 +416,10 @@
  
      if (dead->is_CallStaticJava()) {
        remove_unstable_if_trap(dead->as_CallStaticJava(), false);
      }
    }
-   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
-   bs->unregister_potential_barrier_node(dead);
  }
  
  // Disconnect all useless nodes by disconnecting those at the boundary.
  void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_List& worklist, const Unique_Node_List* root_and_safepoints) {
    uint next = 0;

@@ -467,12 +465,10 @@
    if (_modified_nodes != nullptr) {
      _modified_nodes->remove_useless_nodes(useful.member_set());
    }
  #endif
  
-   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
-   bs->eliminate_useless_gc_barriers(useful, this);
    // clean up the late inline lists
    remove_useless_late_inlines(                &_late_inlines, useful);
    remove_useless_late_inlines(         &_string_late_inlines, useful);
    remove_useless_late_inlines(         &_boxing_late_inlines, useful);
    remove_useless_late_inlines(&_vector_reboxing_late_inlines, useful);

@@ -3210,23 +3206,20 @@
    }
    if (n->is_MemBar()) {
      MemBarNode* mb = n->as_MemBar();
      if (mb->trailing_store() || mb->trailing_load_store()) {
        assert(mb->leading_membar()->trailing_membar() == mb, "bad membar pair");
-       Node* mem = BarrierSet::barrier_set()->barrier_set_c2()->step_over_gc_barrier(mb->in(MemBarNode::Precedent));
+       Node* mem = mb->in(MemBarNode::Precedent);
        assert((mb->trailing_store() && mem->is_Store() && mem->as_Store()->is_release()) ||
               (mb->trailing_load_store() && mem->is_LoadStore()), "missing mem op");
      } else if (mb->leading()) {
        assert(mb->trailing_membar()->leading_membar() == mb, "bad membar pair");
      }
    }
  #endif
    // Count FPU ops and common calls, implements item (3)
-   bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->final_graph_reshaping(this, n, nop, dead_nodes);
-   if (!gc_handled) {
-     final_graph_reshaping_main_switch(n, frc, nop, dead_nodes);
-   }
+   final_graph_reshaping_main_switch(n, frc, nop, dead_nodes);
  
    // Collect CFG split points
    if (n->is_MultiBranch() && !n->is_RangeCheck()) {
      frc._tests.push(n);
    }