Fix broken cherry-pick

Signed-off-by: Eddie Hung <eddie.hung@amd.com>
Xilinx · Oct 5, 2024 · 22decc1 · 22decc1
1 parent fbccb34
commit 22decc1
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/com/xilinx/rapidwright/rwroute/RWRoute.java b/src/com/xilinx/rapidwright/rwroute/RWRoute.java
@@ -1373,14 +1373,6 @@ private void addNodesDelays(NetWrapper net) {
     protected void ripUp(Connection connection) {
         List<RouteNode> rnodes = connection.getRnodes();
         if (rnodes.isEmpty()) {
-<<<<<<< HEAD
-            assert(!connection.isRouted());
-            if (connection.getAltSinkRnodes().isEmpty()) {
-                // If there is no alternate sink, decrement this one-and-only sink node
-                RouteNode sinkRnode = connection.getSinkRnode();
-                rnodes = Collections.singletonList(sinkRnode);
-            }
-=======
             assert(!connection.getSink().isRouted());
             return;
         }
@@ -1393,7 +1385,6 @@ protected void ripUp(Connection connection) {
         } else {
             // Sink is not exclusive
             assert(connection.getAltSinkRnodes().contains(sinkRnode));
->>>>>>> 1d0497a... [RWRoute] ripUp() to not release exclusive sink nodes
         }
 
         for (RouteNode rnode : rnodes) {