luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix external function declarations with class typedef references (#6433 expanded).

This commit is contained in:
Wilson Snyder 2025-09-14 23:52:48 -04:00
parent 3f7d13b2cf
commit 39a9a00299
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/V3LinkDot.cpp
View File

@ -918,15 +918,22 @@ class LinkDotFindVisitor final : public VNVisitor {
nodep->isExternDef(true); // So we check there's a matching extern nodep->isExternDef(true); // So we check there's a matching extern
nodep->classOrPackagep()->unlinkFrBack()->deleteTree(); nodep->classOrPackagep()->unlinkFrBack()->deleteTree();
// Any "Type::" reference in the function's IO are really "MovedToClass::" references // Any "Type::" reference in the function's IO are really "MovedToClass::" references
if (nodep->fvarp()) if (nodep->fvarp()) moveExternFuncDeclRefs(nodep->fvarp(), classp);
nodep->fvarp()->foreach([this, classp](AstClassOrPackageRef* refp) { // for (AstNode* stmtp = nodep->stmtsp(); stmtp; stmtp = stmtp->nextp()) {
if (refp->name() == classp->name() && !refp->paramsp()) { if (AstVar* const portp = VN_CAST(stmtp, Var)) {
UINFO(9, "Cleaning up external function type for class " << refp); if (portp->isIO()) moveExternFuncDeclRefs(portp, classp);
pushDeletep(refp->unlinkFrBack()); }
} }
});
} }
} }
void moveExternFuncDeclRefs(AstNode* nodep, AstClass* classp) {
nodep->foreach([this, classp](AstClassOrPackageRef* refp) { //
if (refp->name() == classp->name() && !refp->paramsp()) {
UINFO(9, "Cleaning up external function type for class " << refp);
pushDeletep(refp->unlinkFrBack());
}
});
}
// VISITORS // VISITORS
void visit(AstNetlist* nodep) override { // FindVisitor:: void visit(AstNetlist* nodep) override { // FindVisitor::

5
test_regress/t/t_class_extern_typeref.v
View File

@ -7,6 +7,7 @@
class uvm_process_guard#(type T=int); class uvm_process_guard#(type T=int);
T m_context; T m_context;
extern function T get_context(); extern function T get_context();
extern function new(T ctxt);
endclass endclass
// When this moves into class, note it's not uvm_process_guard#()::T // When this moves into class, note it's not uvm_process_guard#()::T
@ -15,6 +16,10 @@ function uvm_process_guard::T uvm_process_guard::get_context();
return this.m_context; return this.m_context;
endfunction endfunction
function uvm_process_guard::new(uvm_process_guard::T ctxt);
this.m_context = ctxt;
endfunction : new
class uvm_sequence_base; class uvm_sequence_base;
typedef uvm_process_guard#(uvm_sequence_base) m_guard_t; typedef uvm_process_guard#(uvm_sequence_base) m_guard_t;
endclass endclass