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

Fix recursive default assignment for subarrays (#4589) (#7202)

Browse Source
This commit is contained in:
Julian Carrier
2026-03-05 16:05:54 -05:00
committed by GitHub
parent 4f4d48e9d7
commit 45a5e72509
6 changed files with 107 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Const.cpp
+20 -5
View File
@@ -2667,12 +2667,27 @@ class ConstVisitor final : public VNVisitor {
iterateChildren(nodep);
if (const AstInitArray* const initp = VN_CAST(nodep->lhsp(), InitArray)) {
if (!(m_doExpensive || m_params)) return false;
// At present only support 1D unpacked arrays
const auto initOfConst = [](const AstNode* const nodep) -> bool { //
return VN_IS(nodep, Const) || VN_IS(nodep, InitItem);
const auto isConstInit = [](const AstNode* const exprp,
const auto& isConstInitRecurse) -> bool {
if (VN_IS(exprp, Const)) return true;
if (const AstInitItem* const itemp = VN_CAST(exprp, InitItem)) {
return isConstInitRecurse(itemp->valuep(), isConstInitRecurse);
}
if (const AstInitArray* const arrayp = VN_CAST(exprp, InitArray)) {
const auto itemIsConstInit = [&isConstInitRecurse](const AstNode* const itemp)
-> bool {
return isConstInitRecurse(itemp, isConstInitRecurse);
};
if (arrayp->initsp() && !arrayp->initsp()->forall(itemIsConstInit)) return false;
if (arrayp->defaultp()
&& !isConstInitRecurse(arrayp->defaultp(), isConstInitRecurse)) {
return false;
}
return true;
}
return false;
};
if (initp->initsp() && !initp->initsp()->forall(initOfConst)) return false;
if (initp->defaultp() && !initp->defaultp()->forall(initOfConst)) return false;
if (!isConstInit(initp, isConstInit)) return false;
} else if (!VN_IS(nodep->lhsp(), Const)) {
return false;
}