luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-09-02 10:48:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dfg: Fix crash on additional driver from non-DFG logic

Browse Source 
Ensure variables written by non-DFG code are kept

Fixes #3740
This commit is contained in:
Geza Lore
2022-11-12 11:55:49 +00:00
parent 6736e92cdb
commit dbcaad99c5
6 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3DfgDfgToAst.cpp
+7 -7
View File
@@ -415,14 +415,14 @@ class DfgToAstVisitor final : DfgVisitor {
// Remap all references to point to the canonical variables, if one exists
VNDeleter deleter;
m_modp->foreach([&](AstVarRef* refp) {
// Any variable that is written outside the DFG will have itself as the canonical
// var, so need not be replaced, furthermore, if a variable is traced, we don't
// want to update the write ref we just created above, so we only replace read only
// references.
if (!refp->access().isReadOnly()) return;
// Any variable that is written partially outside the DFG will have itself as the
// canonical var, so need not be replaced, furthermore, if a variable is traced, we
// don't want to update the write-refs we just created above, so we only replace
// read-only references to those variables to those variables we know are not written
// in non-DFG logic.
if (!refp->access().isReadOnly() || refp->varp()->user3()) return;
const auto it = m_canonVars.find(refp->varp());
if (it == m_canonVars.end()) return;
if (it->second == refp->varp()) return;
if (it == m_canonVars.end() || it->second == refp->varp()) return;
refp->replaceWith(new AstVarRef{refp->fileline(), it->second, refp->access()});
deleter.pushDeletep(refp);
});