# HG changeset patch # User shade # Date 1584369746 -3600 # Mon Mar 16 15:42:26 2020 +0100 # Node ID b4d336b958162e3cc654272880d67c8ae70ac470 # Parent 367b1f73904c7c2990c441accd026f813b54ee6f 8241070: Shenandoah: remove unused local variables in C2 support diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp @@ -525,7 +525,6 @@ assert(((decorators & C2_TIGHTLY_COUPLED_ALLOC) != 0 || !ShenandoahSATBBarrier) && (decorators & C2_ARRAY_COPY) != 0, "unexpected caller of this code"); C2OptAccess& opt_access = static_cast(access); PhaseGVN& gvn = opt_access.gvn(); - MergeMemNode* mm = opt_access.mem(); if (ShenandoahStoreValEnqueueBarrier) { Node* enqueue = gvn.transform(new ShenandoahEnqueueBarrierNode(val.node())); diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp @@ -788,7 +788,6 @@ Node* c = ctrl; do { if (c->is_Region()) { - Node* phi_bottom = NULL; for (DUIterator_Fast imax, i = c->fast_outs(imax); i < imax && mem == NULL; i++) { Node* u = c->fast_out(i); if (u->is_Phi() && u->bottom_type() == Type::MEMORY) { @@ -1445,11 +1444,9 @@ val_phi->init_req(_heap_stable, uncasted_val); raw_mem_phi->init_req(_heap_stable, raw_mem); - Node* reg2_ctrl = NULL; // Null case test_null(ctrl, val, null_ctrl, phase); if (null_ctrl != NULL) { - reg2_ctrl = null_ctrl->in(0); region->init_req(_null_path, null_ctrl); val_phi->init_req(_null_path, uncasted_val); raw_mem_phi->init_req(_null_path, raw_mem); @@ -1464,7 +1461,6 @@ Node* not_cset_ctrl = NULL; in_cset_fast_test(ctrl, not_cset_ctrl, uncasted_val, raw_mem, phase); if (not_cset_ctrl != NULL) { - if (reg2_ctrl == NULL) reg2_ctrl = not_cset_ctrl->in(0); region->init_req(_not_cset, not_cset_ctrl); val_phi->init_req(_not_cset, uncasted_val); raw_mem_phi->init_req(_not_cset, raw_mem); @@ -1818,7 +1814,6 @@ bol->set_req(1, cmp); phase->register_new_node(bol, entry_c); - Node* old_bol =iff->in(1); phase->igvn().replace_input_of(iff, 1, bol); } } @@ -2398,7 +2393,7 @@ iteration++; assert(iteration <= 2+max_depth || _phase->C->has_irreducible_loop() || has_never_branch(_phase->C->root()), ""); if (trace) { tty->print_cr("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); } - IdealLoopTree* last_updated_ilt = NULL; + for (int i = rpo_list.size() - 1; i >= 0; i--) { Node* c = rpo_list.at(i);