From 1e251e9471931c1bfbbe6dcf84691cc24f054ba3 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Wed, 13 May 2020 17:00:59 +0200 Subject: [PATCH] 8241070: Shenandoah: remove unused local variables in C2 support Reviewed-by: shade --- src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp | 1 - src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp index 184b290b2ac..01aa950120e 100644 --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp @@ -525,7 +525,6 @@ Node* ShenandoahBarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& 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 index 19f1deab8d8..edc78a11999 100644 --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp @@ -788,7 +788,6 @@ Node* ShenandoahBarrierC2Support::find_bottom_mem(Node* ctrl, PhaseIdealLoop* ph 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) { @@ -1672,7 +1671,6 @@ void ShenandoahBarrierC2Support::move_gc_state_test_out_of_loop(IfNode* iff, Pha 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); } } @@ -2263,7 +2261,7 @@ void MemoryGraphFixer::collect_memory_nodes() { 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);