From: whitequark <whitequark@whitequark.org>
Date: Thu, 15 Jul 2021 22:27:27 +0000 (+0000)
Subject: cxxrtl: mark dead local wires as unused even with inlining disabled.
X-Git-Tag: yosys-0.10~102^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54b6cb645fe7ecd492521dd05072baf9086ebdb1;p=yosys.git

cxxrtl: mark dead local wires as unused even with inlining disabled.

Fixes #2739.
---

diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 70a3add5d..26c534bec 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -2733,12 +2733,14 @@ struct CxxrtlWorker {
 			for (auto wire : module->wires()) {
 				auto &wire_type = wire_types[wire];
 				if (!wire_type.is_local()) continue;
-				if (!wire->name.isPublic() && !inline_internal) continue;
-				if (wire->name.isPublic() && !inline_public) continue;
-
 				if (live_wires[wire].empty()) {
 					wire_type = {WireType::UNUSED}; // wire never used
-				} else if (flow.is_inlinable(wire, live_wires[wire])) {
+					continue;
+				}
+
+				if (!wire->name.isPublic() && !inline_internal) continue;
+				if (wire->name.isPublic() && !inline_public) continue;
+				if (flow.is_inlinable(wire, live_wires[wire])) {
 					if (flow.wire_comb_defs[wire].size() > 1)
 						log_cmd_error("Wire %s.%s has multiple drivers!\n", log_id(module), log_id(wire));
 					log_assert(flow.wire_comb_defs[wire].size() == 1);