github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-22 14:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extern function member references.

Browse Source
This commit is contained in:
Wilson Snyder 2020-11-26 08:55:32 -05:00
parent ad21f2e850
commit 60a1d25a96
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/V3LinkDot.cpp
View File

@ -985,7 +985,7 @@ class LinkDotFindVisitor final : public AstNVisitor {
// Remember the existing symbol table scope
VL_RESTORER(m_classOrPackagep);
VL_RESTORER(m_curSymp);
VSymEnt* const oldCurSymp = m_curSymp;
VSymEnt* upSymp = m_curSymp;
{
// Change to appropriate package if extern declaration (vs definition)
if (nodep->classOrPackagep()) {
@ -1000,6 +1000,7 @@ class LinkDotFindVisitor final : public AstNVisitor {
nodep->v3error("Extern declaration's scope is not a defined class");
} else {
m_curSymp = m_statep->getNodeSym(classp);
upSymp = m_curSymp;
if (!nodep->isExternDef()) {
// Move it to proper spot under the target class
nodep->unlinkFrBack();
@ -1017,7 +1018,7 @@ class LinkDotFindVisitor final : public AstNVisitor {
// Create symbol table for the task's vars
string name = string{nodep->isExternProto() ? "extern " : ""} + nodep->name();
m_curSymp = m_statep->insertBlock(m_curSymp, name, nodep, m_classOrPackagep);
m_curSymp->fallbackp(oldCurSymp);
m_curSymp->fallbackp(upSymp);
// Convert the func's range to the output variable
// This should probably be done in the Parser instead, as then we could
// just attach normal signal attributes to it.

10
test_regress/t/t_class_extern.v
View File

@ -5,6 +5,7 @@
// SPDX-License-Identifier: CC0-1.0
class Cls;
int value;
extern function int ext_f_np;
extern function int ext_f_p();
extern function int ext_f_i(int in);
@ -18,7 +19,7 @@ function int Cls::ext_f_np;
endfunction
function int Cls::ext_f_p();
return 2;
return value;
endfunction
function int Cls::ext_f_i(int in);
@ -33,16 +34,17 @@ task Cls::ext_t_p();
endtask
task Cls::ext_t_i(int in);
if (in != 2) $stop;
value = in;
endtask
module t (/*AUTOARG*/);
initial begin
Cls c = new;
if (c.ext_f_np() != 1) $stop;
if (c.ext_f_p() != 2) $stop;
if (c.ext_f_i(10) != 11) $stop;
c.ext_t_i(2);
c.ext_t_np();
c.ext_t_p();
if (c.ext_f_np() != 1) $stop;
if (c.ext_f_p() != 2) $stop;
if (c.ext_f_i(10) != 11) $stop;
end
endmodule