Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

V3Life: don't depend on AstNode::editCountGbl()

Browse Source 
No functional change intended.
This commit is contained in:
Geza Lore 2022-09-24 20:44:00 +01:00
parent 78e659a142
commit 10796457d2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/V3Life.cpp
View File

@ -130,6 +130,7 @@ class LifeBlock final {
LifeMap m_map; // Current active lifetime map for current scope LifeMap m_map; // Current active lifetime map for current scope
LifeBlock* const m_aboveLifep; // Upper life, or nullptr LifeBlock* const m_aboveLifep; // Upper life, or nullptr
LifeState* const m_statep; // Current global state LifeState* const m_statep; // Current global state
bool m_replacedVref = false; // Replaced a variable reference since last clearing
public: public:
LifeBlock(LifeBlock* aboveLifep, LifeState* statep) LifeBlock(LifeBlock* aboveLifep, LifeState* statep)
@ -178,6 +179,8 @@ public:
m_map.emplace(nodep, LifeVarEntry{LifeVarEntry::COMPLEXASSIGN{}}); m_map.emplace(nodep, LifeVarEntry{LifeVarEntry::COMPLEXASSIGN{}});
} }
} }
void clearReplaced() { m_replacedVref = false; }
bool replaced() const { return m_replacedVref; }
void varUsageReplace(AstVarScope* nodep, AstVarRef* varrefp) { void varUsageReplace(AstVarScope* nodep, AstVarRef* varrefp) {
// Variable rvalue. If it references a constant, we can replace it // Variable rvalue. If it references a constant, we can replace it
const auto it = m_map.find(nodep); const auto it = m_map.find(nodep);
@ -188,6 +191,7 @@ public:
// We'll later constant propagate // We'll later constant propagate
UINFO(4, " replaceconst: " << varrefp << endl); UINFO(4, " replaceconst: " << varrefp << endl);
varrefp->replaceWith(constp->cloneTree(false)); varrefp->replaceWith(constp->cloneTree(false));
m_replacedVref = true;
VL_DO_DANGLING(varrefp->deleteTree(), varrefp); VL_DO_DANGLING(varrefp->deleteTree(), varrefp);
++m_statep->m_statAssnCon; ++m_statep->m_statAssnCon;
return; // **DONE, no longer a var reference** return; // **DONE, no longer a var reference**
@ -307,10 +311,10 @@ private:
void visit(AstNodeAssign* nodep) override { void visit(AstNodeAssign* nodep) override {
// Collect any used variables first, as lhs may also be on rhs // Collect any used variables first, as lhs may also be on rhs
// Similar code in V3Dead // Similar code in V3Dead
const uint64_t lastEdit = AstNode::editCountGbl(); // When it was last edited
m_sideEffect = false; m_sideEffect = false;
m_lifep->clearReplaced();
iterateAndNextNull(nodep->rhsp()); iterateAndNextNull(nodep->rhsp());
if (lastEdit != AstNode::editCountGbl()) { if (m_lifep->replaced()) {
// We changed something, try to constant propagate, but don't delete the // We changed something, try to constant propagate, but don't delete the
// assignment as we still need nodep to remain. // assignment as we still need nodep to remain.
V3Const::constifyEdit(nodep->rhsp()); // rhsp may change V3Const::constifyEdit(nodep->rhsp()); // rhsp may change