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 compilation error on unreachable disable fork / wait fork (#5339)

Browse Source 
Signed-off-by: Arkadiusz Kozdra <akozdra@antmicro.com>
This commit is contained in:
Arkadiusz Kozdra 2024-08-08 00:44:02 +02:00 committed by GitHub
parent e6fe367bdb
commit f78c4e8490
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/V3Timing.cpp
View File

@ -341,17 +341,12 @@ class TimingSuspendableVisitor final : public VNVisitor {
}
}
void visit(AstNodeCCall* nodep) override {
if (!m_underFork || (m_underFork & F_MIGHT_SUSPEND))
new V3GraphEdge{&m_suspGraph, getSuspendDepVtx(nodep->funcp()),
getSuspendDepVtx(m_procp), m_underFork ? P_FORK : P_CALL};
new V3GraphEdge{&m_suspGraph, getSuspendDepVtx(nodep->funcp()), getSuspendDepVtx(m_procp),
P_CALL};
new V3GraphEdge{&m_procGraph, getNeedsProcDepVtx(nodep->funcp()),
getNeedsProcDepVtx(m_procp), P_CALL};
if (m_underFork && !(m_underFork & F_MIGHT_SUSPEND)) {
addFlags(nodep, T_NEEDS_PROC | T_ALLOCS_PROC);
}
iterateChildren(nodep);
}
void visit(AstBegin* nodep) override {
@ -365,9 +360,7 @@ class TimingSuspendableVisitor final : public VNVisitor {
new V3GraphEdge{&m_procGraph, getNeedsProcDepVtx(nodep), getNeedsProcDepVtx(m_procp),
P_CALL};
if (m_underFork && !(m_underFork & F_MIGHT_SUSPEND)) {
addFlags(nodep, T_NEEDS_PROC | T_ALLOCS_PROC);
}
if (m_underFork) addFlags(nodep, T_NEEDS_PROC | T_ALLOCS_PROC);
m_procp = nodep;
m_underFork = 0;
@ -1128,11 +1121,22 @@ class TimingControlVisitor final : public VNVisitor {
// var
alwaysp->addNextHere(nodep);
}
void visit(AstDisableFork* nodep) override {
if (hasFlags(m_procp, T_HAS_PROC)) return;
// never reached by any process; remove to avoid compilation error
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);
}
void visit(AstWaitFork* nodep) override {
AstCExpr* const exprp = new AstCExpr{nodep->fileline(), "vlProcess->completedFork()", 1};
exprp->pure(false);
AstWait* const waitp = new AstWait{nodep->fileline(), exprp, nullptr};
nodep->replaceWith(waitp);
if (hasFlags(m_procp, T_HAS_PROC)) {
AstCExpr* const exprp
= new AstCExpr{nodep->fileline(), "vlProcess->completedFork()", 1};
exprp->pure(false);
AstWait* const waitp = new AstWait{nodep->fileline(), exprp, nullptr};
nodep->replaceWith(waitp);
} else {
// never reached by any process; remove to avoid compilation error
nodep->unlinkFrBack();
}
VL_DO_DANGLING(nodep->deleteTree(), nodep);
}
void visit(AstWait* nodep) override {

7
test_regress/t/t_disable_fork3.v
View File

@ -4,6 +4,13 @@
// any use, without warranty, 2023 by Antmicro Ltd.
// SPDX-License-Identifier: CC0-1.0
class C;
task proc;
disable fork;
wait fork;
endtask
endclass
module t;
initial begin
fork begin