From 006a40a3532830857d7bd88145013e1dc14ee934 Mon Sep 17 00:00:00 2001
From: gatecat <gatecat@ds0.me>
Date: Thu, 1 Jul 2021 11:45:23 +0100
Subject: interchange: Fix handling of constants in macros

Signed-off-by: gatecat <gatecat@ds0.me>
---
 fpga_interchange/arch.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fpga_interchange/arch.cc b/fpga_interchange/arch.cc
index de172d90..c3d5e973 100644
--- a/fpga_interchange/arch.cc
+++ b/fpga_interchange/arch.cc
@@ -754,8 +754,8 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay
 bool Arch::pack()
 {
     decode_lut_cells();
-    merge_constant_nets();
     expand_macros();
+    merge_constant_nets();
     pack_ports();
     pack_default_conns();
     pack_cluster();
-- 
cgit v1.2.3