Merge branch 'master' into 2024.2.0

Signed-off-by: Chris Lavin <[email protected]>
Xilinx · Dec 2, 2024 · c96faf8 · c96faf8
2 parents 5c1dc99 + 3836227
commit c96faf8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/com/xilinx/rapidwright/design/ModuleInst.java b/src/com/xilinx/rapidwright/design/ModuleInst.java
@@ -39,9 +39,6 @@
 import com.xilinx.rapidwright.device.Site;
 import com.xilinx.rapidwright.device.SiteTypeEnum;
 import com.xilinx.rapidwright.device.Tile;
-import com.xilinx.rapidwright.edif.EDIFNet;
-import com.xilinx.rapidwright.edif.EDIFPortInst;
-import com.xilinx.rapidwright.edif.EDIFTools;
 import com.xilinx.rapidwright.util.MessageGenerator;
 import com.xilinx.rapidwright.util.Utils;
 
@@ -356,6 +353,10 @@ public boolean place(Site newAnchorSite, boolean skipIncompatible, boolean allow
                         }
                     }
                 }
+                if (existingSiteInst != null) {
+                    unplace();
+                    return false;
+                }
             }
 
             if (newSite == null || existingSiteInst != null) {