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

Fix mis-aliasing of instances with mailbox parameter types (#5632 partial).

Browse Source
This commit is contained in:
Wilson Snyder 2024-11-29 09:20:02 -05:00
parent d750ffc129
commit 93090c56ee
7 changed files with 123 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -48,6 +48,7 @@ Verilator 5.031 devel
* Fix NBAs to unpacked arrays of unpacked structs (#5603). [Geza Lore] * Fix NBAs to unpacked arrays of unpacked structs (#5603). [Geza Lore]
* Fix array of struct member overwrites on member update (#5605) (#5618) (#5628). [sumpster] * Fix array of struct member overwrites on member update (#5605) (#5618) (#5628). [sumpster]
* Fix interface and struct pattern collision (#5639) (#5640). [Todd Strader] * Fix interface and struct pattern collision (#5639) (#5640). [Todd Strader]
* Fix mis-aliasing of instances with mailbox parameter types (#5632 partial).
Verilator 5.030 2024-10-27 Verilator 5.030 2024-10-27

115
src/V3AstNodeDType.h
View File

@ -52,6 +52,10 @@ private:
// METHODS // METHODS
const AstNodeDType* skipRefIterp(bool skipConst, bool skipEnum) const VL_MT_STABLE; const AstNodeDType* skipRefIterp(bool skipConst, bool skipEnum) const VL_MT_STABLE;
protected:
// METHODS
virtual bool similarDTypeNode(const AstNodeDType* samep) const = 0;
public: public:
ASTGEN_MEMBERS_AstNodeDType; ASTGEN_MEMBERS_AstNodeDType;
// ACCESSORS // ACCESSORS
@ -86,6 +90,12 @@ public:
return const_cast<AstNodeDType*>( return const_cast<AstNodeDType*>(
static_cast<const AstNodeDType*>(this)->skipRefIterp(true, false)); static_cast<const AstNodeDType*>(this)->skipRefIterp(true, false));
} }
// (Slow) Recurse over MemberDType|ParamTypeDType|RefDType to other type
const AstNodeDType* skipRefToNonRefp() const { return skipRefIterp(false, false); }
AstNodeDType* skipRefToNonRefp() {
return const_cast<AstNodeDType*>(
static_cast<const AstNodeDType*>(this)->skipRefIterp(false, false));
}
// (Slow) recurses - Structure alignment 1,2,4 or 8 bytes (arrays affect this) // (Slow) recurses - Structure alignment 1,2,4 or 8 bytes (arrays affect this)
virtual int widthAlignBytes() const = 0; virtual int widthAlignBytes() const = 0;
// (Slow) recurses - Width in bytes rounding up 1,2,4,8,12,... // (Slow) recurses - Width in bytes rounding up 1,2,4,8,12,...
@ -99,8 +109,16 @@ public:
virtual AstNodeDType* virtRefDType2p() const { return nullptr; } virtual AstNodeDType* virtRefDType2p() const { return nullptr; }
// Iff has second dtype, set as generic node function // Iff has second dtype, set as generic node function
virtual void virtRefDType2p(AstNodeDType* nodep) {} virtual void virtRefDType2p(AstNodeDType* nodep) {}
// Assignable equivalence. Call skipRefp() on this and samep before calling // Assignable equivalence. Calls skipRefToNonRefp() during comparisons.
virtual bool similarDType(const AstNodeDType* samep) const = 0; bool similarDType(const AstNodeDType* samep) const {
const AstNodeDType* nodep = this;
nodep = nodep->skipRefToNonRefp();
samep = samep->skipRefToNonRefp();
if (nodep == samep) return true;
if (nodep->type() != samep->type()) return false;
return nodep->similarDTypeNode(samep);
}
// Iff has a non-null subDTypep(), as generic node function // Iff has a non-null subDTypep(), as generic node function
virtual AstNodeDType* subDTypep() const VL_MT_STABLE { return nullptr; } virtual AstNodeDType* subDTypep() const VL_MT_STABLE { return nullptr; }
virtual bool isFourstate() const; virtual bool isFourstate() const;
@ -173,14 +191,13 @@ public:
} }
bool sameNode(const AstNode* samep) const override { bool sameNode(const AstNode* samep) const override {
const AstNodeArrayDType* const asamep = VN_DBG_AS(samep, NodeArrayDType); const AstNodeArrayDType* const asamep = VN_DBG_AS(samep, NodeArrayDType);
return (hi() == asamep->hi() && subDTypep() == asamep->subDTypep() return hi() == asamep->hi() && rangenp()->sameTree(asamep->rangenp())
&& rangenp()->sameTree(asamep->rangenp())); && subDTypep() == asamep->subDTypep();
} // HashedDT doesn't recurse, so need to check children } // HashedDT doesn't recurse, so need to check children
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
if (type() != samep->type()) return false;
const AstNodeArrayDType* const asamep = VN_DBG_AS(samep, NodeArrayDType); const AstNodeArrayDType* const asamep = VN_DBG_AS(samep, NodeArrayDType);
return (hi() == asamep->hi() && rangenp()->sameTree(asamep->rangenp()) return hi() == asamep->hi() && rangenp()->sameTree(asamep->rangenp())
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp())); && subDTypep()->similarDType(asamep->subDTypep());
} }
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
AstNodeDType* subDTypep() const override VL_MT_STABLE { AstNodeDType* subDTypep() const override VL_MT_STABLE {
@ -249,7 +266,7 @@ public:
int widthAlignBytes() const override; int widthAlignBytes() const override;
// (Slow) recurses - Width in bytes rounding up 1,2,4,8,12,... // (Slow) recurses - Width in bytes rounding up 1,2,4,8,12,...
int widthTotalBytes() const override; int widthTotalBytes() const override;
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
return this == samep; // We don't compare members, require exact equivalence return this == samep; // We don't compare members, require exact equivalence
} }
string name() const override VL_MT_STABLE { return m_name; } string name() const override VL_MT_STABLE { return m_name; }
@ -327,11 +344,10 @@ public:
if (!asamep->keyDTypep()) return false; if (!asamep->keyDTypep()) return false;
return (subDTypep() == asamep->subDTypep() && keyDTypep() == asamep->keyDTypep()); return (subDTypep() == asamep->subDTypep() && keyDTypep() == asamep->keyDTypep());
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
if (type() != samep->type()) return false;
const AstAssocArrayDType* const asamep = VN_DBG_AS(samep, AssocArrayDType); const AstAssocArrayDType* const asamep = VN_DBG_AS(samep, AssocArrayDType);
return asamep->subDTypep() return asamep->subDTypep() && subDTypep()->similarDType(asamep->subDTypep())
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp()); && asamep->keyDTypep() && keyDTypep()->similarDType(asamep->keyDTypep());
} }
string prettyDTypeName(bool full) const override; string prettyDTypeName(bool full) const override;
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
@ -400,9 +416,7 @@ public:
void dumpJson(std::ostream& str) const override; void dumpJson(std::ostream& str) const override;
// width/widthMin/numeric compared elsewhere // width/widthMin/numeric compared elsewhere
bool sameNode(const AstNode* samep) const override; bool sameNode(const AstNode* samep) const override;
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override { return sameNode(samep); }
return type() == samep->type() && sameNode(samep);
}
string name() const override VL_MT_STABLE { return m.m_keyword.ascii(); } string name() const override VL_MT_STABLE { return m.m_keyword.ascii(); }
string prettyDTypeName(bool full) const override; string prettyDTypeName(bool full) const override;
const char* broken() const override { const char* broken() const override {
@ -477,7 +491,7 @@ class AstBracketArrayDType final : public AstNodeDType {
// Associative/Queue/Normal array data type, ie "[dtype_or_expr]" // Associative/Queue/Normal array data type, ie "[dtype_or_expr]"
// only for early parsing then becomes another data type // only for early parsing then becomes another data type
// @astgen op1 := childDTypep : Optional[AstNodeDType] // moved to refDTypep() in V3Width // @astgen op1 := childDTypep : Optional[AstNodeDType] // moved to refDTypep() in V3Width
// @astgen op2 := elementsp : AstNode // ??? key dtype ??? // @astgen op2 := elementsp : AstNode // Number of elements in array
public: public:
AstBracketArrayDType(FileLine* fl, VFlagChildDType, AstNodeDType* childDTypep, AstBracketArrayDType(FileLine* fl, VFlagChildDType, AstNodeDType* childDTypep,
AstNode* elementsp) AstNode* elementsp)
@ -486,7 +500,7 @@ public:
this->elementsp(elementsp); this->elementsp(elementsp);
} }
ASTGEN_MEMBERS_AstBracketArrayDType; ASTGEN_MEMBERS_AstBracketArrayDType;
bool similarDType(const AstNodeDType* samep) const override { return sameNode(samep); } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstNodeDType* subDTypep() const override VL_MT_STABLE { return childDTypep(); } AstNodeDType* subDTypep() const override VL_MT_STABLE { return childDTypep(); }
// METHODS // METHODS
// Will be removed in V3Width, which relies on this // Will be removed in V3Width, which relies on this
@ -513,7 +527,7 @@ public:
const AstCDType* const asamep = VN_DBG_AS(samep, CDType); const AstCDType* const asamep = VN_DBG_AS(samep, CDType);
return m_name == asamep->m_name; return m_name == asamep->m_name;
} }
bool similarDType(const AstNodeDType* samep) const override { return sameNode(samep); } bool similarDTypeNode(const AstNodeDType* samep) const override { return sameNode(samep); }
string name() const override VL_MT_STABLE { return m_name; } string name() const override VL_MT_STABLE { return m_name; }
string prettyDTypeName(bool) const override { return m_name; } string prettyDTypeName(bool) const override { return m_name; }
// METHODS // METHODS
@ -553,9 +567,7 @@ public:
const AstClassRefDType* const asamep = VN_DBG_AS(samep, ClassRefDType); const AstClassRefDType* const asamep = VN_DBG_AS(samep, ClassRefDType);
return (m_classp == asamep->m_classp && m_classOrPackagep == asamep->m_classOrPackagep); return (m_classp == asamep->m_classp && m_classOrPackagep == asamep->m_classOrPackagep);
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override { return sameNode(samep); }
return this == samep || (type() == samep->type() && sameNode(samep));
}
void dump(std::ostream& str = std::cout) const override; void dump(std::ostream& str = std::cout) const override;
void dumpJson(std::ostream& str = std::cout) const override; void dumpJson(std::ostream& str = std::cout) const override;
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
@ -597,7 +609,7 @@ public:
const AstConstDType* const sp = VN_DBG_AS(samep, ConstDType); const AstConstDType* const sp = VN_DBG_AS(samep, ConstDType);
return (m_refDTypep == sp->m_refDTypep); return (m_refDTypep == sp->m_refDTypep);
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
return skipRefp()->similarDType(samep->skipRefp()); return skipRefp()->similarDType(samep->skipRefp());
} }
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
@ -630,7 +642,7 @@ public:
AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; } AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; }
AstNodeDType* virtRefDTypep() const override { return nullptr; } AstNodeDType* virtRefDTypep() const override { return nullptr; }
void virtRefDTypep(AstNodeDType* nodep) override {} void virtRefDTypep(AstNodeDType* nodep) override {}
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
int widthAlignBytes() const override { return 1; } int widthAlignBytes() const override { return 1; }
int widthTotalBytes() const override { return 1; } int widthTotalBytes() const override { return 1; }
@ -667,9 +679,7 @@ public:
const AstDefImplicitDType* const sp = VN_DBG_AS(samep, DefImplicitDType); const AstDefImplicitDType* const sp = VN_DBG_AS(samep, DefImplicitDType);
return uniqueNum() == sp->uniqueNum(); return uniqueNum() == sp->uniqueNum();
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override { return sameNode(samep); }
return type() == samep->type() && sameNode(samep);
}
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
AstNodeDType* subDTypep() const override VL_MT_STABLE { AstNodeDType* subDTypep() const override VL_MT_STABLE {
return dtypep() ? dtypep() : childDTypep(); return dtypep() ? dtypep() : childDTypep();
@ -712,11 +722,9 @@ public:
if (!asamep->subDTypep()) return false; if (!asamep->subDTypep()) return false;
return subDTypep() == asamep->subDTypep(); return subDTypep() == asamep->subDTypep();
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
if (type() != samep->type()) return false;
const AstDynArrayDType* const asamep = VN_DBG_AS(samep, DynArrayDType); const AstDynArrayDType* const asamep = VN_DBG_AS(samep, DynArrayDType);
return asamep->subDTypep() return asamep->subDTypep() && subDTypep()->similarDType(asamep->subDTypep());
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp());
} }
string prettyDTypeName(bool full) const override; string prettyDTypeName(bool full) const override;
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
@ -748,7 +756,7 @@ public:
AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; } AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; }
AstNodeDType* virtRefDTypep() const override { return nullptr; } AstNodeDType* virtRefDTypep() const override { return nullptr; }
void virtRefDTypep(AstNodeDType* nodep) override {} void virtRefDTypep(AstNodeDType* nodep) override {}
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
int widthAlignBytes() const override { return 1; } int widthAlignBytes() const override { return 1; }
int widthTotalBytes() const override { return 1; } int widthTotalBytes() const override { return 1; }
@ -790,7 +798,7 @@ public:
const AstEnumDType* const sp = VN_DBG_AS(samep, EnumDType); const AstEnumDType* const sp = VN_DBG_AS(samep, EnumDType);
return uniqueNum() == sp->uniqueNum(); return uniqueNum() == sp->uniqueNum();
} }
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return sameNode(samep); }
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
AstNodeDType* subDTypep() const override VL_MT_STABLE { AstNodeDType* subDTypep() const override VL_MT_STABLE {
return m_refDTypep ? m_refDTypep : childDTypep(); return m_refDTypep ? m_refDTypep : childDTypep();
@ -860,7 +868,7 @@ public:
void dumpJson(std::ostream& str = std::cout) const override; void dumpJson(std::ostream& str = std::cout) const override;
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
int widthAlignBytes() const override { return 0; } int widthAlignBytes() const override { return 0; }
int widthTotalBytes() const override { return 0; } int widthTotalBytes() const override { return 0; }
bool isPortDecl() const { return m_portDecl; } bool isPortDecl() const { return m_portDecl; }
@ -929,7 +937,7 @@ public:
void refDTypep(AstNodeDType* nodep) { m_refDTypep = nodep; } void refDTypep(AstNodeDType* nodep) { m_refDTypep = nodep; }
AstNodeDType* virtRefDTypep() const override { return m_refDTypep; } AstNodeDType* virtRefDTypep() const override { return m_refDTypep; }
void virtRefDTypep(AstNodeDType* nodep) override { refDTypep(nodep); } void virtRefDTypep(AstNodeDType* nodep) override { refDTypep(nodep); }
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
// //
// (Slow) recurse down to find basic data type (Note don't need virtual - // (Slow) recurse down to find basic data type (Note don't need virtual -
// AstVar isn't a NodeDType) // AstVar isn't a NodeDType)
@ -966,7 +974,11 @@ public:
AstNodeDType* subDTypep() const override VL_MT_STABLE { return m_subDTypep; } AstNodeDType* subDTypep() const override VL_MT_STABLE { return m_subDTypep; }
bool partial() const { return m_partial; } bool partial() const { return m_partial; }
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool sameNode(const AstNode* samep) const override {
const AstNBACommitQueueDType* const asamep = VN_DBG_AS(samep, NBACommitQueueDType);
return m_partial == asamep->m_partial;
}
bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
int widthAlignBytes() const override { return 1; } int widthAlignBytes() const override { return 1; }
int widthTotalBytes() const override { return 24; } int widthTotalBytes() const override { return 24; }
@ -995,10 +1007,9 @@ public:
return dtypep() ? dtypep() : childDTypep(); return dtypep() ? dtypep() : childDTypep();
} }
AstBasicDType* basicp() const override VL_MT_STABLE { return subDTypep()->basicp(); } AstBasicDType* basicp() const override VL_MT_STABLE { return subDTypep()->basicp(); }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
if (type() != samep->type()) return false;
const AstParamTypeDType* const sp = VN_DBG_AS(samep, ParamTypeDType); const AstParamTypeDType* const sp = VN_DBG_AS(samep, ParamTypeDType);
return this->subDTypep()->skipRefp()->similarDType(sp->subDTypep()->skipRefp()); return this->subDTypep()->similarDType(sp->subDTypep());
} }
int widthAlignBytes() const override { return dtypep()->widthAlignBytes(); } int widthAlignBytes() const override { return dtypep()->widthAlignBytes(); }
int widthTotalBytes() const override { return dtypep()->widthTotalBytes(); } int widthTotalBytes() const override { return dtypep()->widthTotalBytes(); }
@ -1025,7 +1036,7 @@ public:
ASTGEN_MEMBERS_AstParseTypeDType; ASTGEN_MEMBERS_AstParseTypeDType;
AstNodeDType* dtypep() const VL_MT_STABLE { return nullptr; } AstNodeDType* dtypep() const VL_MT_STABLE { return nullptr; }
// METHODS // METHODS
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
int widthAlignBytes() const override { return 0; } int widthAlignBytes() const override { return 0; }
int widthTotalBytes() const override { return 0; } int widthTotalBytes() const override { return 0; }
@ -1064,11 +1075,9 @@ public:
if (!asamep->subDTypep()) return false; if (!asamep->subDTypep()) return false;
return (subDTypep() == asamep->subDTypep()); return (subDTypep() == asamep->subDTypep());
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
if (type() != samep->type()) return false;
const AstQueueDType* const asamep = VN_DBG_AS(samep, QueueDType); const AstQueueDType* const asamep = VN_DBG_AS(samep, QueueDType);
return asamep->subDTypep() return asamep->subDTypep() && subDTypep()->similarDType(asamep->subDTypep());
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp());
} }
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
string prettyDTypeName(bool full) const override; string prettyDTypeName(bool full) const override;
@ -1121,8 +1130,8 @@ public:
return (m_typedefp == asamep->m_typedefp && m_refDTypep == asamep->m_refDTypep return (m_typedefp == asamep->m_typedefp && m_refDTypep == asamep->m_refDTypep
&& m_name == asamep->m_name && m_classOrPackagep == asamep->m_classOrPackagep); && m_name == asamep->m_name && m_classOrPackagep == asamep->m_classOrPackagep);
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
return skipRefp()->similarDType(samep->skipRefp()); return subDTypep()->similarDType(samep->subDTypep());
} }
void dump(std::ostream& str = std::cout) const override; void dump(std::ostream& str = std::cout) const override;
void dumpJson(std::ostream& str = std::cout) const override; void dumpJson(std::ostream& str = std::cout) const override;
@ -1172,11 +1181,9 @@ public:
if (!asamep->subDTypep()) return false; if (!asamep->subDTypep()) return false;
return (subDTypep() == asamep->subDTypep()); return (subDTypep() == asamep->subDTypep());
} }
bool similarDType(const AstNodeDType* samep) const override { bool similarDTypeNode(const AstNodeDType* samep) const override {
if (type() != samep->type()) return false;
const AstSampleQueueDType* const asamep = VN_DBG_AS(samep, SampleQueueDType); const AstSampleQueueDType* const asamep = VN_DBG_AS(samep, SampleQueueDType);
return asamep->subDTypep() return asamep->subDTypep() && subDTypep()->similarDType(asamep->subDTypep());
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp());
} }
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
@ -1209,7 +1216,7 @@ public:
AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; } AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; }
AstNodeDType* virtRefDTypep() const override { return nullptr; } AstNodeDType* virtRefDTypep() const override { return nullptr; }
void virtRefDTypep(AstNodeDType* nodep) override {} void virtRefDTypep(AstNodeDType* nodep) override {}
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
int widthAlignBytes() const override { return 1; } int widthAlignBytes() const override { return 1; }
int widthTotalBytes() const override { return 1; } int widthTotalBytes() const override { return 1; }
@ -1238,7 +1245,7 @@ public:
return nullptr; return nullptr;
} }
bool sameNode(const AstNode* samep) const override; bool sameNode(const AstNode* samep) const override;
bool similarDType(const AstNodeDType* samep) const override; bool similarDTypeNode(const AstNodeDType* samep) const override;
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
AstNodeDType* subDTypep() const override VL_MT_STABLE { AstNodeDType* subDTypep() const override VL_MT_STABLE {
@ -1268,7 +1275,7 @@ public:
AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; } AstNodeDType* subDTypep() const override VL_MT_STABLE { return nullptr; }
AstNodeDType* virtRefDTypep() const override { return nullptr; } AstNodeDType* virtRefDTypep() const override { return nullptr; }
void virtRefDTypep(AstNodeDType* nodep) override {} void virtRefDTypep(AstNodeDType* nodep) override {}
bool similarDType(const AstNodeDType* samep) const override { return this == samep; } bool similarDTypeNode(const AstNodeDType* samep) const override { return this == samep; }
AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; } AstBasicDType* basicp() const override VL_MT_STABLE { return nullptr; }
int widthAlignBytes() const override { return 1; } int widthAlignBytes() const override { return 1; }
int widthTotalBytes() const override { return 1; } int widthTotalBytes() const override { return 1; }
@ -1292,7 +1299,7 @@ public:
return nullptr; return nullptr;
} }
bool sameNode(const AstNode* samep) const override; bool sameNode(const AstNode* samep) const override;
bool similarDType(const AstNodeDType* samep) const override; bool similarDTypeNode(const AstNodeDType* samep) const override;
void dumpSmall(std::ostream& str) const override; void dumpSmall(std::ostream& str) const override;
AstNodeDType* getChildDTypep() const override { return childDTypep(); } AstNodeDType* getChildDTypep() const override { return childDTypep(); }
AstNodeDType* subDTypep() const override VL_MT_STABLE { AstNodeDType* subDTypep() const override VL_MT_STABLE {

12
src/V3AstNodes.cpp
View File

@ -2358,11 +2358,9 @@ bool AstWildcardArrayDType::sameNode(const AstNode* samep) const {
if (!asamep->subDTypep()) return false; if (!asamep->subDTypep()) return false;
return (subDTypep() == asamep->subDTypep()); return (subDTypep() == asamep->subDTypep());
} }
bool AstWildcardArrayDType::similarDType(const AstNodeDType* samep) const { bool AstWildcardArrayDType::similarDTypeNode(const AstNodeDType* samep) const {
if (type() != samep->type()) return false;
const AstWildcardArrayDType* const asamep = VN_DBG_AS(samep, WildcardArrayDType); const AstWildcardArrayDType* const asamep = VN_DBG_AS(samep, WildcardArrayDType);
return asamep->subDTypep() return asamep->subDTypep() && subDTypep()->similarDType(asamep->subDTypep());
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp());
} }
void AstSampleQueueDType::dumpSmall(std::ostream& str) const { void AstSampleQueueDType::dumpSmall(std::ostream& str) const {
this->AstNodeDType::dumpSmall(str); this->AstNodeDType::dumpSmall(str);
@ -2377,11 +2375,9 @@ bool AstUnsizedArrayDType::sameNode(const AstNode* samep) const {
if (!asamep->subDTypep()) return false; if (!asamep->subDTypep()) return false;
return (subDTypep() == asamep->subDTypep()); return (subDTypep() == asamep->subDTypep());
} }
bool AstUnsizedArrayDType::similarDType(const AstNodeDType* samep) const { bool AstUnsizedArrayDType::similarDTypeNode(const AstNodeDType* samep) const {
if (type() != samep->type()) return false;
const AstUnsizedArrayDType* const asamep = VN_DBG_AS(samep, UnsizedArrayDType); const AstUnsizedArrayDType* const asamep = VN_DBG_AS(samep, UnsizedArrayDType);
return asamep->subDTypep() return asamep->subDTypep() && subDTypep()->similarDType(asamep->subDTypep());
&& subDTypep()->skipRefp()->similarDType(asamep->subDTypep()->skipRefp());
} }
void AstEmptyQueueDType::dumpSmall(std::ostream& str) const { void AstEmptyQueueDType::dumpSmall(std::ostream& str) const {
this->AstNodeDType::dumpSmall(str); this->AstNodeDType::dumpSmall(str);

5
src/V3Hasher.cpp
View File

@ -138,6 +138,11 @@ class HasherVisitor final : public VNVisitorConst {
iterateConstNull(nodep->virtRefDType2p()); iterateConstNull(nodep->virtRefDType2p());
}); });
} }
void visit(AstBracketArrayDType* nodep) override {
m_hash += hashNodeAndIterate(nodep, false, HASH_CHILDREN, [this, nodep]() {
iterateConstNull(nodep->virtRefDTypep());
});
}
void visit(AstDynArrayDType* nodep) override { void visit(AstDynArrayDType* nodep) override {
m_hash += hashNodeAndIterate(nodep, false, HASH_CHILDREN, [this, nodep]() { // m_hash += hashNodeAndIterate(nodep, false, HASH_CHILDREN, [this, nodep]() { //
iterateConstNull(nodep->virtRefDTypep()); iterateConstNull(nodep->virtRefDTypep());

14
src/V3Param.cpp
View File

@ -318,7 +318,7 @@ class ParamProcessor final {
static string paramValueString(const AstNode* nodep) { static string paramValueString(const AstNode* nodep) {
if (const AstRefDType* const refp = VN_CAST(nodep, RefDType)) { if (const AstRefDType* const refp = VN_CAST(nodep, RefDType)) {
nodep = refp->skipRefToEnump(); nodep = refp->skipRefToNonRefp();
} }
string key = nodep->name(); string key = nodep->name();
if (const AstIfaceRefDType* const ifrtp = VN_CAST(nodep, IfaceRefDType)) { if (const AstIfaceRefDType* const ifrtp = VN_CAST(nodep, IfaceRefDType)) {
@ -373,7 +373,7 @@ class ParamProcessor final {
// TODO: This parameter value number lookup via a constructed key string is not // TODO: This parameter value number lookup via a constructed key string is not
// particularly robust for type parameters. We should really have a type // particularly robust for type parameters. We should really have a type
// equivalence predicate function. // equivalence predicate function.
if (AstRefDType* const refp = VN_CAST(nodep, RefDType)) { nodep = refp->skipRefToEnump(); } if (AstRefDType* const refp = VN_CAST(nodep, RefDType)) nodep = refp->skipRefToNonRefp();
const string paramStr = paramValueString(nodep); const string paramStr = paramValueString(nodep);
// cppcheck-has-bug-suppress unreadVariable // cppcheck-has-bug-suppress unreadVariable
V3Hash hash = V3Hasher::uncachedHash(nodep) + paramStr; V3Hash hash = V3Hasher::uncachedHash(nodep) + paramStr;
@ -415,7 +415,7 @@ class ParamProcessor final {
return nullptr; return nullptr;
} }
bool isString(AstNodeDType* nodep) { bool isString(AstNodeDType* nodep) {
if (AstBasicDType* const basicp = VN_CAST(nodep->skipRefToEnump(), BasicDType)) if (AstBasicDType* const basicp = VN_CAST(nodep->skipRefToNonRefp(), BasicDType))
return basicp->isString(); return basicp->isString();
return false; return false;
} }
@ -767,8 +767,8 @@ class ParamProcessor final {
} }
} else if (AstParamTypeDType* const modvarp = pinp->modPTypep()) { } else if (AstParamTypeDType* const modvarp = pinp->modPTypep()) {
AstNodeDType* rawTypep = VN_CAST(pinp->exprp(), NodeDType); AstNodeDType* rawTypep = VN_CAST(pinp->exprp(), NodeDType);
AstNodeDType* const exprp = rawTypep ? rawTypep->skipRefToEnump() : nullptr; AstNodeDType* exprp = rawTypep ? rawTypep->skipRefToNonRefp() : nullptr;
const AstNodeDType* const origp = modvarp->skipRefToEnump(); const AstNodeDType* const origp = modvarp->skipRefToNonRefp();
if (!exprp) { if (!exprp) {
pinp->v3error("Parameter type pin value isn't a type: Param " pinp->v3error("Parameter type pin value isn't a type: Param "
<< pinp->prettyNameQ() << " of " << nodep->prettyNameQ()); << pinp->prettyNameQ() << " of " << nodep->prettyNameQ());
@ -782,7 +782,9 @@ class ParamProcessor final {
// This prevents making additional modules, and makes coverage more // This prevents making additional modules, and makes coverage more
// obvious as it won't show up under a unique module page name. // obvious as it won't show up under a unique module page name.
} else { } else {
V3Const::constifyParamsEdit(exprp); VL_DO_DANGLING(V3Const::constifyParamsEdit(exprp), exprp);
rawTypep = VN_CAST(pinp->exprp(), NodeDType);
exprp = rawTypep ? rawTypep->skipRefToNonRefp() : nullptr;
longnamer += "_" + paramSmallName(srcModp, modvarp) + paramValueNumber(exprp); longnamer += "_" + paramSmallName(srcModp, modvarp) + paramValueNumber(exprp);
any_overridesr = true; any_overridesr = true;
} }

18
test_regress/t/t_mailbox_array.py Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env python3
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
#
# Copyright 2024 by Wilson Snyder. 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-License-Identifier: LGPL-3.0-only OR Artistic-2.0
import vltest_bootstrap
test.scenarios('simulator')
test.compile(verilator_flags2=['--fno-slice']) # TODO remove -fno-slice, issue #5632/#5644
test.execute()
test.passes()

26
test_regress/t/t_mailbox_array.v Normal file
View File

@ -0,0 +1,26 @@
// DESCRIPTION: Verilator: Verilog Test module
//
// This file ONLY is placed under the Creative Commons Public Domain, for
// any use, without warranty, 2024 by Wilson Snyder.
// SPDX-License-Identifier: CC0-1.0
class Cls;
localparam DWIDTH = 6;
typedef int my_type_t [2**DWIDTH];
mailbox #(my_type_t) m_mbx;
function new();
this.m_mbx = new(1);
endfunction
endclass
module tb_top();
Cls c;
initial begin
c = new();
$display("%p", c);
$write("*-* All Finished *-*\n");
$finish;
end
endmodule