From ea8274fbf07d7308bcef5aacbe553dc7b37887e3 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 7 Jun 2021 14:00:19 +0000
Subject: [PATCH] 8267875: Shenandoah: Duplicated code in
 ShenandoahBarrierSetC2::ideal_node()

Reviewed-by: rkennke, roland
---
 .../gc/shenandoah/c2/shenandoahBarrierSetC2.cpp     | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index 8d4c616b21d..8bd18c1aa66 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -1068,22 +1068,13 @@ Node* ShenandoahBarrierSetC2::ideal_node(PhaseGVN* phase, Node* n, bool can_resh
       in1 = step_over_gc_barrier(in1);
     }
 
-    PhaseIterGVN* igvn = phase->is_IterGVN();
     if (in1 != n->in(1)) {
-      if (igvn != NULL) {
-        n->set_req_X(1, in1, igvn);
-      } else {
-        n->set_req(1, in1);
-      }
+      n->set_req_X(1, in1, phase);
       assert(in2 == n->in(2), "only one change");
       return n;
     }
     if (in2 != n->in(2)) {
-      if (igvn != NULL) {
-        n->set_req_X(2, in2, igvn);
-      } else {
-        n->set_req(2, in2);
-      }
+      n->set_req_X(2, in2, phase);
       return n;
     }
   } else if (can_reshape &&