src/hotspot/share/opto/node.cpp

@@ -518,13 +518,10 @@
    }
    if (n->is_OpaqueTemplateAssertionPredicate()) {
      C->add_template_assertion_predicate_opaque(n->as_OpaqueTemplateAssertionPredicate());
    }
  
-   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
-   bs->register_potential_barrier_node(n);
- 
    n->set_idx(C->next_unique()); // Get new unique index as well
    NOT_PRODUCT(n->_igv_idx = C->next_igv_idx());
    DEBUG_ONLY( n->verify_construction() );
    NOT_PRODUCT(nodes_created++);
    // Do not patch over the debug_idx of a clone, because it makes it

@@ -640,12 +637,10 @@
  
      if (is_CallStaticJava()) {
        compile->remove_unstable_if_trap(as_CallStaticJava(), false);
      }
    }
-   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
-   bs->unregister_potential_barrier_node(this);
  
    // See if the input array was allocated just prior to the object
    int edge_size = _max*sizeof(void*);
    int out_edge_size = _outmax*sizeof(void*);
    char *in_array = ((char*)_in);

@@ -1464,12 +1459,10 @@
              // The restriction (outcnt() <= 2) is the same as in set_req_X()
              // and remove_globally_dead_node().
              igvn->add_users_to_worklist( n );
            } else if (dead->is_data_proj_of_pure_function(n)) {
              igvn->_worklist.push(n);
-           } else {
-             BarrierSet::barrier_set()->barrier_set_c2()->enqueue_useful_gc_barrier(igvn, n);
            }
          }
        }
        igvn->C->remove_useless_node(dead);
      } // (dead->outcnt() == 0)