Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Fix self references to parameterized classes (#3962)

Browse Source
This commit is contained in:
Ryszard Rozak 2023-02-17 17:17:35 +01:00 committed by GitHub
parent 063f9a7a4c
commit 45f955f175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/V3Param.cpp
View File

@ -547,7 +547,10 @@ class ParamProcessor final {
AstClass* const newClassp) {
if (AstClassRefDType* const classRefp = VN_CAST(nodep, ClassRefDType)) {
if (classRefp->classp() == oldClassp) classRefp->classp(newClassp);
} else if (AstClassOrPackageRef* const classRefp = VN_CAST(nodep, ClassOrPackageRef)) {
if (classRefp->classOrPackagep() == oldClassp) classRefp->classOrPackagep(newClassp);
}
if (nodep->op1p()) replaceRefsRecurse(nodep->op1p(), oldClassp, newClassp);
if (nodep->op2p()) replaceRefsRecurse(nodep->op2p(), oldClassp, newClassp);
if (nodep->op3p()) replaceRefsRecurse(nodep->op3p(), oldClassp, newClassp);

31
test_regress/t/t_class_param.v
View File

@ -104,6 +104,22 @@ class DictOperator #(type T) extends T;
endfunction
endclass
class Getter1 #(int T=0);
static function int get_1();
return Getter1#(1)::T;
endfunction
endclass
class Getter2 #(int T=5);
static function int get_T();
return T;
endfunction
static function int get_2();
return Getter2#(2)::get_T();
endfunction
endclass
module t (/*AUTOARG*/);
Cls c12;
@ -118,6 +134,9 @@ module t (/*AUTOARG*/);
IntQueue qi;
ClsWithParamField cls_param_field;
DictOperator #(DictWrapper) dict_op;
Getter1 getter1;
Getter1 #(1) getter1_param_1;
Getter2 getter2;
int arr [1:0] = '{1, 2};
initial begin
c12 = new;
@ -132,6 +151,10 @@ module t (/*AUTOARG*/);
qi = new;
cls_param_field = new;
dict_op = new;
getter1 = new;
getter1_param_1 = new;
getter2 = new;
if (Cls#()::PBASE != 12) $stop;
if (Cls#(4)::PBASE != 4) $stop;
if (Cls8_t::PBASE != 8) $stop;
@ -186,6 +209,14 @@ module t (/*AUTOARG*/);
dict_op.set("abcd", 1);
if(dict_op.get("abcd") != 1) $stop;
if (getter1.get_1() != 1) $stop;
if (Getter1::get_1() != 1) $stop;
if (getter1_param_1.get_1() != 1) $stop;
if (getter2.get_2() != 2) $stop;
if (Getter2::get_2() != 2) $stop;
if (Getter2#(2)::get_2() != 2) $stop;
$write("*-* All Finished *-*\n");
$finish;
end