luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-09-01 10:27:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix constraint_mode()/rand_mode() in constructor being overwritten by init code (#7054)

Browse Source
This commit is contained in:
Yilou Wang
2026-02-11 09:32:08 -08:00
committed by GitHub
parent 84350859e0
commit 996a4b6e1a
3 changed files with 90 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Randomize.cpp
+22 -6
View File
@@ -2366,12 +2366,28 @@ class RandomizeVisitor final : public VNVisitor {
= new AstCMethodHard{fl, new AstVarRef{fl, modeVarModp, modeVarp, VAccess::WRITE},
VCMethod::DYN_RESIZE, new AstConst{fl, modeCount}};
dynarrayNewp->dtypeSetVoid();
AstNodeFTask* const newp = VN_AS(m_memberMap.findMember(classp, "new"), NodeFTask);
UASSERT_OBJ(newp, classp, "No new() in class");
newp->addStmtsp(dynarrayNewp->makeStmt());
newp->addStmtsp(makeModeSetLoop(fl,
new AstVarRef{fl, modeVarModp, modeVarp, VAccess::WRITE},
new AstConst{fl, 1}, true));
AstNodeFTask* const ctorNewp = VN_AS(m_memberMap.findMember(classp, "new"), NodeFTask);
UASSERT_OBJ(ctorNewp, classp, "No new() in class");
// Build init chain: resize -> set-all-to-1 loop
AstNode* const initFirstp = dynarrayNewp->makeStmt();
initFirstp->addNext(
makeModeSetLoop(fl, new AstVarRef{fl, modeVarModp, modeVarp, VAccess::WRITE},
new AstConst{fl, 1}, true));
// Prepend init code before user statements in constructor body, but after
// var declarations and super.new(). This ensures that user's constraint_mode()
// or rand_mode() calls in the constructor execute after mode arrays are initialized.
// Pattern from V3LinkDot::addImplicitSuperNewCall.
for (AstNode* stmtp = ctorNewp->stmtsp(); stmtp; stmtp = stmtp->nextp()) {
if (!VN_IS(stmtp, NodeStmt)) continue; // Skip var declarations
if (const AstStmtExpr* const sep = VN_CAST(stmtp, StmtExpr)) {
if (VN_IS(sep->exprp(), New)) continue; // Skip super.new()
}
// Found first user statement - insert init code before it
stmtp->addHereThisAsNext(initFirstp);
return;
}
// No user statements (empty constructor or only var decls/super.new)
ctorNewp->addStmtsp(initFirstp);
}
void makeStaticModeInit(AstVar* modeVarp, AstClass* classp, uint32_t modeCount) {
// For static constraint mode, we need lazy initialization since it's shared across