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

Fix instability in last commit from dangling deletes.

This commit is contained in:
Wilson Snyder 2020-12-09 23:57:40 -05:00
parent 53ce708294
commit 5b2844e1be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3Delayed.cpp
View File

@ -107,10 +107,10 @@ private:
if (blocking) nodep->user5(true); if (blocking) nodep->user5(true);
AstVarScope* vscp = nodep->varScopep(); AstVarScope* vscp = nodep->varScopep();
// UINFO(4, " MVU " << blocking << " " << nodep << endl); // UINFO(4, " MVU " << blocking << " " << nodep << endl);
if (!vscp->user5p()) { AstNode* lastrefp = vscp->user5p();
if (!lastrefp) {
vscp->user5p(nodep); vscp->user5p(nodep);
} else { } else {
AstNode* lastrefp = vscp->user5p();
bool last_was_blocking = lastrefp->user5(); bool last_was_blocking = lastrefp->user5();
if (last_was_blocking != blocking) { if (last_was_blocking != blocking) {
AstNode* nonblockingp = blocking ? nodep : lastrefp; AstNode* nonblockingp = blocking ? nodep : lastrefp;
@ -412,9 +412,9 @@ private:
if (newlhsp) { if (newlhsp) {
nodep->lhsp(newlhsp); nodep->lhsp(newlhsp);
} else { } else {
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); VL_DO_DANGLING(pushDeletep(nodep->unlinkFrBack()), nodep);
} }
VL_DO_DANGLING(lhsp->deleteTree(), lhsp); VL_DO_DANGLING(pushDeletep(lhsp), lhsp);
} else { } else {
iterateChildren(nodep); iterateChildren(nodep);
} }
@ -472,7 +472,7 @@ private:
AstVarRef* newrefp = new AstVarRef(nodep->fileline(), dlyvscp, VAccess::WRITE); AstVarRef* newrefp = new AstVarRef(nodep->fileline(), dlyvscp, VAccess::WRITE);
newrefp->user2(true); // No reason to do it again newrefp->user2(true); // No reason to do it again
nodep->replaceWith(newrefp); nodep->replaceWith(newrefp);
VL_DO_DANGLING(nodep->deleteTree(), nodep); VL_DO_DANGLING(pushDeletep(nodep), nodep);
} else if (!m_inDly && nodep->access().isWriteOrRW()) { } else if (!m_inDly && nodep->access().isWriteOrRW()) {
// UINFO(9, "NBA " << nodep << endl); // UINFO(9, "NBA " << nodep << endl);
if (!m_inInitial) { if (!m_inInitial) {