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

Fix local:: mis-allowed in class extends

Browse Source
This commit is contained in:
Wilson Snyder 2024-11-10 15:27:13 -05:00
parent 863abdb1f7
commit 75e9986d39
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/V3LinkDot.cpp
View File

@ -2143,7 +2143,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
VSymEnt* m_curSymp = nullptr; // SymEnt for current lookup point VSymEnt* m_curSymp = nullptr; // SymEnt for current lookup point
VSymEnt* m_modSymp = nullptr; // SymEnt for current module VSymEnt* m_modSymp = nullptr; // SymEnt for current module
VSymEnt* m_pinSymp = nullptr; // SymEnt for pin lookups VSymEnt* m_pinSymp = nullptr; // SymEnt for pin lookups
VSymEnt* m_fromSymp = nullptr; // SymEnt for randomize lookups VSymEnt* m_randSymp = nullptr; // SymEnt for randomize target class's lookups
const AstCell* m_cellp = nullptr; // Current cell const AstCell* m_cellp = nullptr; // Current cell
AstNodeModule* m_modp = nullptr; // Current module AstNodeModule* m_modp = nullptr; // Current module
AstNodeFTask* m_ftaskp = nullptr; // Current function/task AstNodeFTask* m_ftaskp = nullptr; // Current function/task
@ -2599,7 +2599,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
UINFO(8, indent() << m_ds.ascii() << endl); UINFO(8, indent() << m_ds.ascii() << endl);
const DotStates lastStates = m_ds; const DotStates lastStates = m_ds;
const bool start = (m_ds.m_dotPos == DP_NONE); // Save, as m_dotp will be changed const bool start = (m_ds.m_dotPos == DP_NONE); // Save, as m_dotp will be changed
VL_RESTORER(m_fromSymp); VL_RESTORER(m_randSymp);
{ {
if (start) { // Starting dot sequence if (start) { // Starting dot sequence
if (debug() >= 9) nodep->dumpTree("- dot-in: "); if (debug() >= 9) nodep->dumpTree("- dot-in: ");
@ -2795,7 +2795,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
classOrPackagep = cpackagerefp->classOrPackagep(); classOrPackagep = cpackagerefp->classOrPackagep();
UASSERT_OBJ(classOrPackagep, m_ds.m_dotp->lhsp(), "Bad package link"); UASSERT_OBJ(classOrPackagep, m_ds.m_dotp->lhsp(), "Bad package link");
if (cpackagerefp->name() == "local::") { if (cpackagerefp->name() == "local::") {
m_fromSymp = nullptr; m_randSymp = nullptr;
first = true; first = true;
} else { } else {
m_ds.m_dotSymp = m_statep->getNodeSym(classOrPackagep); m_ds.m_dotSymp = m_statep->getNodeSym(classOrPackagep);
@ -2818,8 +2818,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
VSymEnt* foundp; VSymEnt* foundp;
string baddot; string baddot;
VSymEnt* okSymp = nullptr; VSymEnt* okSymp = nullptr;
if (m_fromSymp) { if (m_randSymp) {
foundp = m_fromSymp->findIdFlat(nodep->name()); foundp = m_randSymp->findIdFlat(nodep->name());
if (foundp) { if (foundp) {
if (!start) m_ds.m_dotPos = DP_MEMBER; if (!start) m_ds.m_dotPos = DP_MEMBER;
if (!m_inWith) { if (!m_inWith) {
@ -3165,8 +3165,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
iterateChildren(nodep); iterateChildren(nodep);
if (nodep->name() == "local::") { if (nodep->name() == "local::") {
if (!m_fromSymp) { if (!m_randSymp) {
nodep->v3error("Illegal 'local::' outside 'randomize() with'"); nodep->v3error("Illegal 'local::' outside 'randomize() with'"
" (IEEE 1800-2023 18.7.1)");
m_ds.m_dotErr = true; m_ds.m_dotErr = true;
} }
} }
@ -3325,7 +3326,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
LINKDOT_VISIT_START(); LINKDOT_VISIT_START();
UINFO(5, indent() << "visit " << nodep << endl); UINFO(5, indent() << "visit " << nodep << endl);
VL_RESTORER(m_ds); VL_RESTORER(m_ds);
VL_RESTORER(m_fromSymp); VL_RESTORER(m_randSymp);
VL_RESTORER(m_randMethodCallp); VL_RESTORER(m_randMethodCallp);
{ {
m_ds.init(m_curSymp); m_ds.init(m_curSymp);
@ -3368,7 +3369,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
nodep->v3error("'randomize() with' on a non-class-instance " nodep->v3error("'randomize() with' on a non-class-instance "
<< fromDtp->prettyNameQ()); << fromDtp->prettyNameQ());
else else
m_fromSymp = m_statep->getNodeSym(classDtp->classp()); m_randSymp = m_statep->getNodeSym(classDtp->classp());
} }
} }
iterateChildren(nodep); iterateChildren(nodep);
@ -3404,7 +3405,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
} }
} }
VL_RESTORER(m_fromSymp); VL_RESTORER(m_randSymp);
bool first = !m_ds.m_dotp || m_ds.m_dotPos == DP_FIRST; bool first = !m_ds.m_dotp || m_ds.m_dotPos == DP_FIRST;
bool staticAccess = false; bool staticAccess = false;
@ -3428,7 +3429,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
= VN_AS(m_ds.m_dotp->lhsp(), ClassOrPackageRef); = VN_AS(m_ds.m_dotp->lhsp(), ClassOrPackageRef);
UASSERT_OBJ(cpackagerefp->classOrPackagep(), m_ds.m_dotp->lhsp(), "Bad package link"); UASSERT_OBJ(cpackagerefp->classOrPackagep(), m_ds.m_dotp->lhsp(), "Bad package link");
if (cpackagerefp->name() == "local::") { if (cpackagerefp->name() == "local::") {
m_fromSymp = nullptr; m_randSymp = nullptr;
first = true; first = true;
} else { } else {
nodep->classOrPackagep(cpackagerefp->classOrPackagep()); nodep->classOrPackagep(cpackagerefp->classOrPackagep());
@ -3500,8 +3501,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
dotSymp = m_statep->findDotted(nodep->fileline(), dotSymp, nodep->dotted(), baddot, dotSymp = m_statep->findDotted(nodep->fileline(), dotSymp, nodep->dotted(), baddot,
okSymp, true); // Maybe nullptr okSymp, true); // Maybe nullptr
} }
if (m_fromSymp) { if (m_randSymp) {
VSymEnt* const foundp = m_fromSymp->findIdFlat(nodep->name()); VSymEnt* const foundp = m_randSymp->findIdFlat(nodep->name());
if (foundp && m_inWith) { if (foundp && m_inWith) {
UINFO(9, indent() << "randomize-with fromSym " << foundp->nodep() << endl); UINFO(9, indent() << "randomize-with fromSym " << foundp->nodep() << endl);
AstNodeExpr* argsp = nullptr; AstNodeExpr* argsp = nullptr;

6
src/verilog.y
View File

@ -7240,12 +7240,6 @@ class_typeExtImpOne<nodeExprp>: // part of IEEE: class_type, where we either ge
{ $$ = new AstClassOrPackageRef{$<fl>1, "$unit", nullptr, nullptr}; { $$ = new AstClassOrPackageRef{$<fl>1, "$unit", nullptr, nullptr};
$<scp>$ = nullptr; // No purpose otherwise, every symtab can see root $<scp>$ = nullptr; // No purpose otherwise, every symtab can see root
SYMP->nextId(PARSEP->rootp()); } SYMP->nextId(PARSEP->rootp()); }
//
| yLOCAL__COLONCOLON yP_COLONCOLON
{ $$ = new AstClassOrPackageRef{$<fl>1, "local::", nullptr, nullptr};
$<scp>$ = nullptr; // UNSUP
SYMP->nextId(PARSEP->rootp());
BBUNSUP($1, "Unsupported: Randomize 'local::'"); }
; ;
//========= //=========

2
test_regress/t/t_package_local_bad.out
View File

@ -1,4 +1,4 @@
%Error: t/t_package_local_bad.v:9:16: Illegal 'local::' outside 'randomize() with' %Error: t/t_package_local_bad.v:9:16: Illegal 'local::' outside 'randomize() with' (IEEE 1800-2023 18.7.1)
9 | $display(local::x); 9 | $display(local::x);
| ^~~~~ | ^~~~~
%Error: t/t_package_local_bad.v:9:23: Can't find definition of scope/variable/func: 'x' %Error: t/t_package_local_bad.v:9:23: Can't find definition of scope/variable/func: 'x'