github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 04:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix foreach colliding index names (#5444)

Browse Source 
Signed-off-by: Arkadiusz Kozdra <akozdra@antmicro.com>
This commit is contained in:
Arkadiusz Kozdra 2024-09-10 13:17:21 +02:00 committed by GitHub
parent 283a5edbdb
commit 2f690c0530
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/V3Randomize.cpp
View File

@ -685,7 +685,7 @@ class ConstraintExprVisitor final : public VNVisitor {
}
VL_DO_DANGLING(nodep->deleteTree(), nodep);
}
void visit(AstForeach* nodep) override {}
void visit(AstBegin* nodep) override {}
void visit(AstConstraintForeach* nodep) override {
// Convert to plain foreach
FileLine* const fl = nodep->fileline();
@ -708,8 +708,11 @@ class ConstraintExprVisitor final : public VNVisitor {
nodep->replaceWith(new AstSFormatF{fl, "%@", false, newp});
} else {
iterateAndNextNull(nodep->stmtsp());
nodep->replaceWith(new AstForeach{fl, nodep->arrayp()->unlinkFrBack(),
nodep->stmtsp()->unlinkFrBackWithNext()});
nodep->replaceWith(
new AstBegin{fl, "",
new AstForeach{fl, nodep->arrayp()->unlinkFrBack(),
nodep->stmtsp()->unlinkFrBackWithNext()},
false, true});
}
VL_DO_DANGLING(nodep->deleteTree(), nodep);
}

2
test_regress/t/t_constraint_foreach.v
View File

@ -26,6 +26,8 @@ class C;
x < 7;
foreach(q[i])
x > i;
foreach(q[i]) // loop again with the same index name
x > i;
};
endclass