From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 14 Feb 2017 14:10:59 +0000 (+0100)
Subject: Fix incorrect "incompatible re-declaration of wire" error in tasks/functions
X-Git-Tag: yosys-0.8~490
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4fb800717101c65344fe78a365b8ae6ca0a90d9e;p=yosys.git

Fix incorrect "incompatible re-declaration of wire" error in tasks/functions
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index eecc04132..f7fcbc479 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2183,9 +2183,16 @@ skip_dynamic_range_lvalue_expansion:;
 					if (wire->children.empty()) {
 						for (auto c : child->children)
 							wire->children.push_back(c->clone());
-					} else {
-						if (!child->children.empty())
+					} else if (!child->children.empty()) {
+						while (child->simplify(true, false, false, stage, -1, false, false)) { }
+						if (GetSize(child->children) == GetSize(wire->children)) {
+							for (int i = 0; i < GetSize(child->children); i++)
+								if (*child->children.at(i) != *wire->children.at(i))
+									goto tcall_incompatible_wires;
+						} else {
+					tcall_incompatible_wires:
 							log_error("Incompatible re-declaration of wire %s at %s:%d.\n", child->str.c_str(), filename.c_str(), linenum);
+						}
 					}
 				}
 				else