parent
6595e5cf55
commit
081ecbd095
|
|
@ -293,6 +293,9 @@ class ParamProcessor final {
|
||||||
std::vector<std::pair<AstParamTypeDType*, int>> m_classParams;
|
std::vector<std::pair<AstParamTypeDType*, int>> m_classParams;
|
||||||
std::unordered_map<AstParamTypeDType*, int> m_paramIndex;
|
std::unordered_map<AstParamTypeDType*, int> m_paramIndex;
|
||||||
|
|
||||||
|
// Guard against infinite recursion in classTypeMatchesDefaultClone slow path
|
||||||
|
std::unordered_set<const AstClass*> m_defaultCloneInProgress;
|
||||||
|
|
||||||
// member names cached for fast lookup
|
// member names cached for fast lookup
|
||||||
VMemberMap m_memberMap;
|
VMemberMap m_memberMap;
|
||||||
|
|
||||||
|
|
@ -1250,13 +1253,20 @@ class ParamProcessor final {
|
||||||
= VN_CAST(origClassRefp->classp()->user4p(), Class);
|
= VN_CAST(origClassRefp->classp()->user4p(), Class);
|
||||||
if (defaultClonep && defaultClonep == exprClassRefp->classp()) return true;
|
if (defaultClonep && defaultClonep == exprClassRefp->classp()) return true;
|
||||||
// Slow path: deparameterize the default type and compare the result.
|
// Slow path: deparameterize the default type and compare the result.
|
||||||
|
// Different templates can never match; use origName() because exprp's
|
||||||
|
// class may already be a specialization (clone) of the template.
|
||||||
if (!origClassRefp->classp()->hasGParam()) return false;
|
if (!origClassRefp->classp()->hasGParam()) return false;
|
||||||
|
if (origClassRefp->classp()->origName() != exprClassRefp->classp()->origName())
|
||||||
|
return false;
|
||||||
|
// Prevent re-entry when classRefDeparam recurses through cellPinCleanup.
|
||||||
|
if (!m_defaultCloneInProgress.insert(origClassRefp->classp()).second) return false;
|
||||||
// const_cast safe: cloneTree doesn't modify the source
|
// const_cast safe: cloneTree doesn't modify the source
|
||||||
AstClassRefDType* const origClonep = static_cast<AstClassRefDType*>(
|
AstClassRefDType* const origClonep = static_cast<AstClassRefDType*>(
|
||||||
const_cast<AstClassRefDType*>(origClassRefp)->cloneTree(false));
|
const_cast<AstClassRefDType*>(origClassRefp)->cloneTree(false));
|
||||||
AstNodeModule* const resolvedModp = classRefDeparam(origClonep, origClassRefp->classp());
|
AstNodeModule* const resolvedModp = classRefDeparam(origClonep, origClassRefp->classp());
|
||||||
const bool match = resolvedModp && VN_CAST(resolvedModp, Class) == exprClassRefp->classp();
|
const bool match = resolvedModp && VN_CAST(resolvedModp, Class) == exprClassRefp->classp();
|
||||||
VL_DO_DANGLING(origClonep->deleteTree(), origClonep);
|
VL_DO_DANGLING(origClonep->deleteTree(), origClonep);
|
||||||
|
m_defaultCloneInProgress.erase(origClassRefp->classp());
|
||||||
return match;
|
return match;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify it
|
||||||
|
# under the terms of either the GNU Lesser General Public License Version 3
|
||||||
|
# or the Perl Artistic License Version 2.0.
|
||||||
|
# SPDX-FileCopyrightText: 2025 Wilson Snyder
|
||||||
|
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
|
||||||
|
|
||||||
|
import vltest_bootstrap
|
||||||
|
|
||||||
|
test.scenarios('simulator')
|
||||||
|
|
||||||
|
test.compile(verilator_flags2=["--binary"])
|
||||||
|
|
||||||
|
test.execute()
|
||||||
|
|
||||||
|
test.passes()
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
// Minimal non-UVM repro.
|
||||||
|
// base class with type-of-type default overridden by derived class.
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify it
|
||||||
|
// under the terms of either the GNU Lesser General Public License Version 3
|
||||||
|
// or the Perl Artistic License Version 2.0.
|
||||||
|
// SPDX-FileCopyrightText: 2026 Wilson Snyder
|
||||||
|
// SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
|
||||||
|
|
||||||
|
package pkg;
|
||||||
|
|
||||||
|
class builtin_comp #(type T = int);
|
||||||
|
static function bit comp(T a, T b);
|
||||||
|
return 1;
|
||||||
|
endfunction
|
||||||
|
endclass
|
||||||
|
|
||||||
|
class class_comp #(type T = int);
|
||||||
|
static function bit comp(T a, T b);
|
||||||
|
return 1;
|
||||||
|
endfunction
|
||||||
|
endclass
|
||||||
|
|
||||||
|
virtual class comparator #(
|
||||||
|
type T = int,
|
||||||
|
type comp_type = builtin_comp #(T)
|
||||||
|
);
|
||||||
|
endclass
|
||||||
|
|
||||||
|
class class_comparator #(type T = int)
|
||||||
|
extends comparator #(T, class_comp #(T));
|
||||||
|
endclass
|
||||||
|
|
||||||
|
endpackage
|
||||||
|
|
||||||
|
module t;
|
||||||
|
import pkg::*;
|
||||||
|
|
||||||
|
class c;
|
||||||
|
int i;
|
||||||
|
function bit compare(c rhs);
|
||||||
|
return i == rhs.i;
|
||||||
|
endfunction
|
||||||
|
function void copy(c rhs);
|
||||||
|
rhs.i = i;
|
||||||
|
endfunction
|
||||||
|
endclass
|
||||||
|
|
||||||
|
initial begin
|
||||||
|
class_comparator #(c) sb;
|
||||||
|
$write("*-* All Finished *-*\n");
|
||||||
|
$finish;
|
||||||
|
end
|
||||||
|
|
||||||
|
endmodule
|
||||||
Loading…
Reference in New Issue