From: Clifford Wolf <clifford@clifford.at>
Date: Thu, 23 May 2013 11:19:28 +0000 (+0200)
Subject: Fixed memory corruption bug in opt_rmunused
X-Git-Tag: yosys-0.2.0~624
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f674150f1c5200f76e0f23739b06fde6a143bb6d;p=yosys.git

Fixed memory corruption bug in opt_rmunused
---

diff --git a/passes/opt/opt_rmunused.cc b/passes/opt/opt_rmunused.cc
index 6cec9b294..3d6d755af 100644
--- a/passes/opt/opt_rmunused.cc
+++ b/passes/opt/opt_rmunused.cc
@@ -172,7 +172,6 @@ static void rmunused_module_signals(RTLIL::Module *module)
 			RTLIL::SigSpec s1 = RTLIL::SigSpec(wire), s2 = s1;
 			assign_map.apply(s2);
 			if (!used_signals.check_any(s2) && wire->port_id == 0) {
-				log("  removing unused non-port wire %s.\n", wire->name.c_str());
 				del_wires.push_back(wire);
 			} else {
 				s1.expand();
@@ -187,6 +186,8 @@ static void rmunused_module_signals(RTLIL::Module *module)
 				if (new_conn.first.width > 0) {
 					new_conn.first.optimize();
 					new_conn.second.optimize();
+					used_signals.add(new_conn.first);
+					used_signals.add(new_conn.second);
 					module->connections.push_back(new_conn);
 				}
 			}
@@ -216,13 +217,19 @@ static void rmunused_module_signals(RTLIL::Module *module)
 		}
 	}
 
-	for (auto wire : del_wires) {
-		module->wires.erase(wire->name);
-		delete wire;
-	}
+	int del_wires_count = 0;
+	for (auto wire : del_wires)
+		if (!used_signals.check_any(RTLIL::SigSpec(wire))) {
+			if (check_public_name(wire->name)) {
+				log("  removing unused non-port wire %s.\n", wire->name.c_str());
+				del_wires_count++;
+			}
+			module->wires.erase(wire->name);
+			delete wire;
+		}
 
-	if (del_wires.size() > 0)
-		log("  removed %zd unused temporary wires.\n", del_wires.size());
+	if (del_wires_count > 0)
+		log("  removed %d unused temporary wires.\n", del_wires_count);
 }
 
 static void rmunused_module(RTLIL::Module *module)