diff options
| author | clairexen <claire@symbioticeda.com> | 2020-09-01 17:28:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 17:28:35 +0200 |
| commit | 452442ac2fcdec92a98a5a0896b2b3866db9e5e9 (patch) | |
| tree | 5b7a08e9e8c1476e986806a851550577434d1148 /frontends | |
| parent | 244af8b8b715642a54af22018fb03ad965ca7be1 (diff) | |
| parent | ecc5c23b4d3ec42599b80f5f4dc8699f024124be (diff) | |
| download | yosys-452442ac2fcdec92a98a5a0896b2b3866db9e5e9.tar.gz yosys-452442ac2fcdec92a98a5a0896b2b3866db9e5e9.tar.bz2 yosys-452442ac2fcdec92a98a5a0896b2b3866db9e5e9.zip | |
Merge pull request #2365 from zachjs/const-arg-loop-split-type
Fix constant args used with function ports split across declarations
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/ast/simplify.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 7f9795d29..2a5ad99c8 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -3211,14 +3211,15 @@ skip_dynamic_range_lvalue_expansion:; if (wire_cache.count(child->str)) { wire = wire_cache.at(child->str); - if (wire->children.empty()) { + bool contains_value = wire->type == AST_LOCALPARAM; + if (wire->children.size() == contains_value) { for (auto c : child->children) wire->children.push_back(c->clone()); } else if (!child->children.empty()) { while (child->simplify(true, false, false, stage, -1, false, false)) { } - if (GetSize(child->children) == GetSize(wire->children)) { + if (GetSize(child->children) == GetSize(wire->children) - contains_value) { for (int i = 0; i < GetSize(child->children); i++) - if (*child->children.at(i) != *wire->children.at(i)) + if (*child->children.at(i) != *wire->children.at(i + contains_value)) goto tcall_incompatible_wires; } else { tcall_incompatible_wires: |