luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Internals: Favor UASSERT_OBJ when have object.

This commit is contained in:
Wilson Snyder 2022-07-12 18:02:45 -04:00
parent 87f1e06c41
commit 63507e8e29
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3Ast.cpp
View File

@ -281,13 +281,13 @@ void AstNode::addNextHere(AstNode* newp) {
// This could be at head, tail, or both (single) // This could be at head, tail, or both (single)
// New could be head of single node, or list // New could be head of single node, or list
UASSERT(newp, "Null item passed to addNext"); UASSERT(newp, "Null item passed to addNext");
UASSERT(!newp->backp(), "New node (back) already assigned?"); UASSERT_OBJ(!newp->backp(), newp, "New node (back) already assigned?");
debugTreeChange(this, "-addHereThs: ", __LINE__, false); debugTreeChange(this, "-addHereThs: ", __LINE__, false);
debugTreeChange(newp, "-addHereNew: ", __LINE__, true); debugTreeChange(newp, "-addHereNew: ", __LINE__, true);
newp->editCountInc(); newp->editCountInc();
AstNode* const addlastp = newp->m_headtailp; // Last node in list to be added AstNode* const addlastp = newp->m_headtailp; // Last node in list to be added
UASSERT(!addlastp->m_nextp, "Headtailp tail isn't at the tail"); UASSERT_OBJ(!addlastp->m_nextp, addlastp, "Headtailp tail isn't at the tail");
// Forward links // Forward links
AstNode* const oldnextp = this->m_nextp; AstNode* const oldnextp = this->m_nextp;
@ -437,7 +437,7 @@ void VNRelinker::dump(std::ostream& str) const {
AstNode* AstNode::unlinkFrBackWithNext(VNRelinker* linkerp) { AstNode* AstNode::unlinkFrBackWithNext(VNRelinker* linkerp) {
debugTreeChange(this, "-unlinkWNextThs: ", __LINE__, true); debugTreeChange(this, "-unlinkWNextThs: ", __LINE__, true);
AstNode* const oldp = this; AstNode* const oldp = this;
UASSERT(oldp->m_backp, "Node has no back, already unlinked?"); UASSERT_OBJ(oldp->m_backp, oldp, "Node has no back, already unlinked?");
oldp->editCountInc(); oldp->editCountInc();
AstNode* const backp = oldp->m_backp; AstNode* const backp = oldp->m_backp;
if (linkerp) { if (linkerp) {
@ -497,7 +497,7 @@ AstNode* AstNode::unlinkFrBackWithNext(VNRelinker* linkerp) {
AstNode* AstNode::unlinkFrBack(VNRelinker* linkerp) { AstNode* AstNode::unlinkFrBack(VNRelinker* linkerp) {
debugTreeChange(this, "-unlinkFrBkThs: ", __LINE__, true); debugTreeChange(this, "-unlinkFrBkThs: ", __LINE__, true);
AstNode* const oldp = this; AstNode* const oldp = this;
UASSERT(oldp->m_backp, "Node has no back, already unlinked?"); UASSERT_OBJ(oldp->m_backp, oldp, "Node has no back, already unlinked?");
oldp->editCountInc(); oldp->editCountInc();
AstNode* const backp = oldp->m_backp; AstNode* const backp = oldp->m_backp;
if (linkerp) { if (linkerp) {
@ -565,7 +565,7 @@ void AstNode::relink(VNRelinker* linkerp) {
} }
AstNode* const newp = this; AstNode* const newp = this;
UASSERT(linkerp && linkerp->m_backp, "Need non-empty linker"); UASSERT(linkerp && linkerp->m_backp, "Need non-empty linker");
UASSERT(!newp->backp(), "New node already linked?"); UASSERT_OBJ(!newp->m_backp, newp, "New node already linked?");
newp->editCountInc(); newp->editCountInc();
if (debug() > 8) { if (debug() > 8) {

4
src/V3Descope.cpp
View File

@ -248,8 +248,8 @@ private:
VL_RESTORER(m_funcp); VL_RESTORER(m_funcp);
if (!nodep->user1()) { if (!nodep->user1()) {
// Static functions should have been moved under the corresponding AstClassPackage // Static functions should have been moved under the corresponding AstClassPackage
UASSERT(!(nodep->isStatic() && VN_IS(m_modp, Class)), UASSERT_OBJ(!(nodep->isStatic() && VN_IS(m_modp, Class)), nodep,
"Static function under AstClass"); "Static function under AstClass");
m_funcp = nodep; m_funcp = nodep;
iterateChildren(nodep); iterateChildren(nodep);
nodep->user1(true); nodep->user1(true);

2
src/V3Inst.cpp
View File

@ -442,7 +442,7 @@ private:
int expr_i = i; int expr_i = i;
if (const AstSliceSel* const slicep = VN_CAST(newp->exprp(), SliceSel)) { if (const AstSliceSel* const slicep = VN_CAST(newp->exprp(), SliceSel)) {
varrefp = VN_AS(slicep->fromp(), VarRef); varrefp = VN_AS(slicep->fromp(), VarRef);
UASSERT(VN_IS(slicep->rhsp(), Const), "Slices should be constant"); UASSERT_OBJ(VN_IS(slicep->rhsp(), Const), slicep, "Slices should be constant");
const int slice_index const int slice_index
= slicep->declRange().left() + in * slicep->declRange().leftToRightInc(); = slicep->declRange().left() + in * slicep->declRange().leftToRightInc();
const auto* const exprArrp = VN_AS(varrefp->dtypep(), UnpackArrayDType); const auto* const exprArrp = VN_AS(varrefp->dtypep(), UnpackArrayDType);