From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 21 Jun 2019 04:55:08 +0000 (-0700)
Subject: Fix gcc error, due to dict invalidation during recursion
X-Git-Tag: working-ls180~1208^2~124
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2076aa6595b5448bc151a22710822a6fb314c55;p=yosys.git

Fix gcc error, due to dict invalidation during recursion
---

diff --git a/Makefile b/Makefile
index fd4e90c15..f363be208 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
-CONFIG := clang
-# CONFIG := gcc
+# CONFIG := clang
+CONFIG := gcc
 # CONFIG := gcc-4.8
 # CONFIG := afl-gcc
 # CONFIG := emcc
diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc
index 82f0f24b2..32c3f9045 100644
--- a/backends/aiger/xaiger.cc
+++ b/backends/aiger/xaiger.cc
@@ -101,12 +101,13 @@ struct XAigerWriter
 				aig_map[bit] = mkgate(a0, a1);
 			} else
 			if (alias_map.count(bit)) {
-				aig_map[bit] = bit2aig(alias_map.at(bit));
+				int a = bit2aig(alias_map.at(bit));
+				aig_map[bit] = a;
 			}
 
 			if (bit == State::Sx || bit == State::Sz) {
 				log_debug("Bit '%s' contains 'x' or 'z' bits. Treating as 1'b0.\n", log_signal(bit));
-				aig_map[bit] = 0;
+				aig_map[bit] = aig_map.at(State::S0);
 			}
 		}