From 607c19a67d4a5379c177b1baa034d514de268bf0 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 16 Jun 2024 21:43:30 -0400 Subject: [PATCH] Fix isPure to be superset of isOutputter. This may cause some additional SIDEEFFECT warnings that previously were not shown. --- src/V3Ast.cpp | 1 - src/V3AstNodeOther.h | 4 ++-- test_regress/t/t_interface_array2.v | 2 ++ test_regress/t/t_wrapper_context_top0.out | 4 ++-- test_regress/t/t_wrapper_context_top1.out | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp index 88372b106..4956420e9 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -801,7 +801,6 @@ AstNode* AstNode::cloneTreeIter(bool needPure) { << this->warnMore() << "... Suggest use a temporary variable in place of this expression"); // this->v3fatalSrc("cloneTreePure debug backtrace"); // Comment in to debug where caused - // it } AstNode* const newp = this->clone(); if (this->m_op1p) newp->op1p(this->m_op1p->cloneTreeIterList(needPure)); diff --git a/src/V3AstNodeOther.h b/src/V3AstNodeOther.h index 387327867..4be906e5f 100644 --- a/src/V3AstNodeOther.h +++ b/src/V3AstNodeOther.h @@ -2786,7 +2786,7 @@ public: bool isGateOptimizable() const override { return false; } bool isPredictOptimizable() const override { return false; } bool isOutputter() override { return true; } - // but isPure() true + bool isPure() override { return false; } AstCoverDecl* declp() const { return m_declp; } // Where defined }; class AstCoverToggle final : public AstNodeStmt { @@ -3379,7 +3379,7 @@ public: bool isGateOptimizable() const override { return false; } bool isPredictOptimizable() const override { return false; } bool isOutputter() override { return true; } - // but isPure() true + bool isPure() override { return false; } AstTraceDecl* declp() const { return m_declp; } VTraceType traceType() const { return m_traceType; } uint32_t baseCode() const { return m_baseCode; } diff --git a/test_regress/t/t_interface_array2.v b/test_regress/t/t_interface_array2.v index 3d41e9451..ced787689 100644 --- a/test_regress/t/t_interface_array2.v +++ b/test_regress/t/t_interface_array2.v @@ -36,9 +36,11 @@ module t assign ifs[i].logic_in_intf = data[i]; end endgenerate + // verilator lint_off SIDEEFFECT modify_interface m3 ( .value(data[return_3()]), .intf_inst(ifs[return_3()])); + // verilator lint_on SIDEEFFECT modify_interface m4 ( .value(data[4]), diff --git a/test_regress/t/t_wrapper_context_top0.out b/test_regress/t/t_wrapper_context_top0.out index 20ca811c4..d028fb387 100644 --- a/test_regress/t/t_wrapper_context_top0.out +++ b/test_regress/t/t_wrapper_context_top0.out @@ -71,9 +71,9 @@ C 'ft/t_wrapper_context.vl22n4pagev_line/topoblockS22,25-29htop0.t C 'ft/t_wrapper_context.vl32n4pagev_line/topoblockS32htop0.top' 11 C 'ft/t_wrapper_context.vl33n7pagev_branch/topoifS33-34htop0.top' 1 C 'ft/t_wrapper_context.vl33n8pagev_branch/topoelseS36htop0.top' 10 -C 'ft/t_wrapper_context.vl38n4pagev_line/topoblockS38-39htop0.top' 1 +C 'ft/t_wrapper_context.vl38n4pagev_line/topoblockS38-39htop0.top' 34 C 'ft/t_wrapper_context.vl40n7pagev_branch/topoifS40htop0.top' 0 -C 'ft/t_wrapper_context.vl40n8pagev_branch/topoelseS46htop0.top' 23 +C 'ft/t_wrapper_context.vl40n8pagev_branch/topoelseS46htop0.top' 34 C 'ft/t_wrapper_context.vl41n11pagev_line/topoelsehtop0.top' 0 C 'ft/t_wrapper_context.vl47n10pagev_branch/topoifS47-49htop0.top' 1 C 'ft/t_wrapper_context.vl47n11pagev_branch/topoelsehtop0.top' 33 diff --git a/test_regress/t/t_wrapper_context_top1.out b/test_regress/t/t_wrapper_context_top1.out index 889121356..391e5cb35 100644 --- a/test_regress/t/t_wrapper_context_top1.out +++ b/test_regress/t/t_wrapper_context_top1.out @@ -71,8 +71,8 @@ C 'ft/t_wrapper_context.vl22n4pagev_line/topoblockS22,25-29htop1.t C 'ft/t_wrapper_context.vl32n4pagev_line/topoblockS32htop1.top' 6 C 'ft/t_wrapper_context.vl33n7pagev_branch/topoifS33-34htop1.top' 1 C 'ft/t_wrapper_context.vl33n8pagev_branch/topoelseS36htop1.top' 5 -C 'ft/t_wrapper_context.vl38n4pagev_line/topoblockS38-39htop1.top' 1 -C 'ft/t_wrapper_context.vl40n7pagev_branch/topoifS40htop1.top' 13 +C 'ft/t_wrapper_context.vl38n4pagev_line/topoblockS38-39htop1.top' 19 +C 'ft/t_wrapper_context.vl40n7pagev_branch/topoifS40htop1.top' 19 C 'ft/t_wrapper_context.vl40n8pagev_branch/topoelseS46htop1.top' 0 C 'ft/t_wrapper_context.vl41n11pagev_line/topoelsehtop1.top' 18 C 'ft/t_wrapper_context.vl47n10pagev_branch/topoifS47-49htop1.top' 0