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

Support AstClass::repairCache() after V3Class (#3431)

Browse Source 
This is a pre-PR to #3363.

Signed-off-by: Krzysztof Bieganski <kbieganski@antmicro.com>
This commit is contained in:
Krzysztof Bieganski 2022-05-17 15:22:43 +02:00 committed by GitHub
parent 0a91ddf38a
commit e018eb7bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/V3AstNodes.cpp
View File

@ -1309,7 +1309,8 @@ void AstClassPackage::cloneRelink() {
} }
void AstClass::insertCache(AstNode* nodep) { void AstClass::insertCache(AstNode* nodep) {
const bool doit = (VN_IS(nodep, Var) || VN_IS(nodep, EnumItemRef) const bool doit = (VN_IS(nodep, Var) || VN_IS(nodep, EnumItemRef)
|| (VN_IS(nodep, NodeFTask) && !VN_AS(nodep, NodeFTask)->isExternProto())); || (VN_IS(nodep, NodeFTask) && !VN_AS(nodep, NodeFTask)->isExternProto())
|| VN_IS(nodep, CFunc));
if (doit) { if (doit) {
if (m_members.find(nodep->name()) != m_members.end()) { if (m_members.find(nodep->name()) != m_members.end()) {
nodep->v3error("Duplicate declaration of member name: " << nodep->prettyNameQ()); nodep->v3error("Duplicate declaration of member name: " << nodep->prettyNameQ());
@ -1320,7 +1321,14 @@ void AstClass::insertCache(AstNode* nodep) {
} }
void AstClass::repairCache() { void AstClass::repairCache() {
clearCache(); clearCache();
for (AstNode* itemp = membersp(); itemp; itemp = itemp->nextp()) { insertCache(itemp); } for (auto* itemp = membersp(); itemp; itemp = itemp->nextp()) {
if (const auto* const scopep = VN_CAST(itemp, Scope)) {
for (auto* itemp = scopep->blocksp(); itemp; itemp = itemp->nextp())
insertCache(itemp);
} else {
insertCache(itemp);
}
}
} }
bool AstClass::isClassExtendedFrom(const AstClass* refClassp, const AstClass* baseClassp) { bool AstClass::isClassExtendedFrom(const AstClass* refClassp, const AstClass* baseClassp) {
// TAIL RECURSIVE // TAIL RECURSIVE

1
src/V3Class.cpp
View File

@ -97,6 +97,7 @@ private:
m_prefix = nodep->name() + "__02e"; // . m_prefix = nodep->name() + "__02e"; // .
iterateChildren(nodep); iterateChildren(nodep);
} }
nodep->repairCache();
} }
virtual void visit(AstNodeModule* nodep) override { virtual void visit(AstNodeModule* nodep) override {
// Visit for NodeModules that are not AstClass (AstClass is-a AstNodeModule) // Visit for NodeModules that are not AstClass (AstClass is-a AstNodeModule)