diff --git a/src/V3Active.cpp b/src/V3Active.cpp index a20bae1fc..6bf73461c 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -542,12 +542,12 @@ private: if (combo && !sequent) { ActiveLatchCheckVisitor latchvisitor{nodep, kwd}; if (kwd == VAlwaysKwd::ALWAYS_LATCH) { - ActiveDlyVisitor dlyvisitor{nodep, ActiveDlyVisitor::CT_LATCH}; + ActiveDlyVisitor{nodep, ActiveDlyVisitor::CT_LATCH}; } else { - ActiveDlyVisitor dlyvisitor{nodep, ActiveDlyVisitor::CT_COMBO}; + ActiveDlyVisitor{nodep, ActiveDlyVisitor::CT_COMBO}; } } else if (!combo && sequent) { - ActiveDlyVisitor dlyvisitor{nodep, ActiveDlyVisitor::CT_SEQ}; + ActiveDlyVisitor{nodep, ActiveDlyVisitor::CT_SEQ}; } } virtual void visit(AstAlways* nodep) override { @@ -620,6 +620,6 @@ public: void V3Active::activeAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ActiveVisitor visitor{nodep}; } // Destruct before checking + { ActiveVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("active", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index ab5155cd4..04aa7f79e 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -128,6 +128,6 @@ public: void V3ActiveTop::activeTopAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ActiveTopVisitor visitor{nodep}; } // Destruct before checking + { ActiveTopVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("activetop", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp index 20f8c3725..db87a0b10 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -475,6 +475,6 @@ public: void V3Assert::assertAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { AssertVisitor visitor{nodep}; } // Destruct before checking + { AssertVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("assert", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp index d4754597c..758d0acf1 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -205,6 +205,6 @@ public: void V3AssertPre::assertPreAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { AssertPreVisitor visitor{nodep}; } // Destruct before checking + { AssertPreVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("assertpre", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp index 9d9d4a483..9ed6706e9 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -308,8 +308,8 @@ void V3Begin::debeginAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); { BeginState state; - { BeginVisitor bvisitor{nodep, &state}; } - if (state.anyFuncInBegin()) { BeginRelinkVisitor brvisitor(nodep, &state); } + { BeginVisitor{nodep, &state}; } + if (state.anyFuncInBegin()) { BeginRelinkVisitor{nodep, &state}; } } // Destruct before checking V3Global::dumpCheckGlobalTree("begin", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp index a3690bddc..da13df889 100644 --- a/src/V3Branch.cpp +++ b/src/V3Branch.cpp @@ -123,5 +123,5 @@ public: void V3Branch::branchAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - BranchVisitor visitor{nodep}; + { BranchVisitor{nodep}; } } diff --git a/src/V3Case.cpp b/src/V3Case.cpp index 830694d1a..c61b1ed7d 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -532,10 +532,10 @@ public: void V3Case::caseAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { CaseVisitor visitor{nodep}; } // Destruct before checking + { CaseVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("case", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } void V3Case::caseLint(AstNodeCase* nodep) { UINFO(4, __FUNCTION__ << ": " << endl); - CaseLintVisitor visitor{nodep}; + { CaseLintVisitor{nodep}; } } diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp index 149202c70..2436d532c 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -203,6 +203,6 @@ public: void V3Cast::castAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { const CastVisitor visitor{nodep}; } // Destruct before checking + { CastVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("cast", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp index 28851bcdb..2e04c826f 100644 --- a/src/V3Cdc.cpp +++ b/src/V3Cdc.cpp @@ -761,5 +761,5 @@ public: void V3Cdc::cdcAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - CdcVisitor visitor{nodep}; + { CdcVisitor{nodep}; } } diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp index 9d28c7ab2..f8a321406 100644 --- a/src/V3Changed.cpp +++ b/src/V3Changed.cpp @@ -257,7 +257,7 @@ private: void genChangeDet(AstVarScope* vscp) { vscp->v3warn(IMPERFECTSCH, "Imperfect scheduling of variable: " << vscp->prettyNameQ()); - ChangedInsertVisitor visitor{vscp, m_statep}; + { ChangedInsertVisitor{vscp, m_statep}; } } // VISITORS @@ -304,7 +304,7 @@ void V3Changed::changedAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); { ChangedState state; - ChangedVisitor visitor{nodep, &state}; + ChangedVisitor{nodep, &state}; } // Destruct before checking V3Global::dumpCheckGlobalTree("changed", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Class.cpp b/src/V3Class.cpp index 5310b7862..8a5b37821 100644 --- a/src/V3Class.cpp +++ b/src/V3Class.cpp @@ -157,6 +157,6 @@ public: void V3Class::classAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ClassVisitor visitor{nodep}; } // Destruct before checking + { ClassVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("class", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp index 9eda5e56f..329f667f5 100644 --- a/src/V3Clean.cpp +++ b/src/V3Clean.cpp @@ -314,6 +314,6 @@ public: void V3Clean::cleanAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { CleanVisitor visitor{nodep}; } // Destruct before checking + { CleanVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("clean", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index 8dde574f9..eeaf0dae0 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -444,6 +444,6 @@ public: void V3Clock::clockAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ClockVisitor visitor{nodep}; } // Destruct before checking + { ClockVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("clock", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index aa38734e4..89b81accd 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -223,6 +223,6 @@ public: void V3Combine::combineAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { CombineVisitor visitor{nodep}; } // Destruct before checking + { CombineVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("combine", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index 766149504..3f822259d 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -543,6 +543,6 @@ public: void V3Coverage::coverage(AstNetlist* rootp) { UINFO(2, __FUNCTION__ << ": " << endl); - { CoverageVisitor visitor{rootp}; } // Destruct before checking + { CoverageVisitor{rootp}; } // Destruct before checking V3Global::dumpCheckGlobalTree("coverage", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp index 905b52969..f372571ab 100644 --- a/src/V3CoverageJoin.cpp +++ b/src/V3CoverageJoin.cpp @@ -114,6 +114,6 @@ public: void V3CoverageJoin::coverageJoin(AstNetlist* rootp) { UINFO(2, __FUNCTION__ << ": " << endl); - { CoverageJoinVisitor visitor{rootp}; } // Destruct before checking + { CoverageJoinVisitor{rootp}; } // Destruct before checking V3Global::dumpCheckGlobalTree("coveragejoin", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp index 7af22c0c4..1ee856172 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -318,7 +318,7 @@ private: // And its children may now be killable too; correct counts // Recurse, as cells may not be directly under the module but in a generate if (!modp->dead()) { // If was dead didn't increment user1's - DeadModVisitor visitor{modp}; + DeadModVisitor{modp}; } VL_DO_DANGLING(modp->unlinkFrBack()->deleteTree(), modp); retry = true; @@ -463,31 +463,31 @@ public: void V3Dead::deadifyModules(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DeadVisitor visitor{nodep, false, false, false, false}; } // Destruct before checking + { DeadVisitor{nodep, false, false, false, false}; } // Destruct before checking V3Global::dumpCheckGlobalTree("deadModules", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } void V3Dead::deadifyDTypes(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DeadVisitor visitor{nodep, false, true, false, false}; } // Destruct before checking + { DeadVisitor{nodep, false, true, false, false}; } // Destruct before checking V3Global::dumpCheckGlobalTree("deadDtypes", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } void V3Dead::deadifyDTypesScoped(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DeadVisitor visitor{nodep, false, true, true, false}; } // Destruct before checking + { DeadVisitor{nodep, false, true, true, false}; } // Destruct before checking V3Global::dumpCheckGlobalTree("deadDtypesScoped", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } void V3Dead::deadifyAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DeadVisitor visitor{nodep, true, true, false, true}; } // Destruct before checking + { DeadVisitor{nodep, true, true, false, true}; } // Destruct before checking V3Global::dumpCheckGlobalTree("deadAll", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } void V3Dead::deadifyAllScoped(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DeadVisitor visitor{nodep, true, true, true, true}; } // Destruct before checking + { DeadVisitor{nodep, true, true, true, true}; } // Destruct before checking V3Global::dumpCheckGlobalTree("deadAllScoped", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index 9d16c28c6..1f7aa2c32 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -512,6 +512,6 @@ public: void V3Delayed::delayedAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { const DelayedVisitor visitor{nodep}; } // Destruct before checking + { DelayedVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("delayed", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp index 72fc81d6d..912d900fa 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -152,6 +152,6 @@ public: void V3Depth::depthAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DepthVisitor visitor{nodep}; } // Destruct before checking + { DepthVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("depth", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp index 99bfb8ca5..2fcaaab91 100644 --- a/src/V3DepthBlock.cpp +++ b/src/V3DepthBlock.cpp @@ -129,6 +129,6 @@ public: void V3DepthBlock::depthBlockAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DepthBlockVisitor visitor{nodep}; } // Destruct before checking + { DepthBlockVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("deepblock", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp index b875ac291..a8f75006f 100644 --- a/src/V3Descope.cpp +++ b/src/V3Descope.cpp @@ -289,6 +289,6 @@ public: void V3Descope::descopeAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { DescopeVisitor visitor{nodep}; } // Destruct before checking + { DescopeVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("descope", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp index 52a1543f8..0904bd638 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -827,11 +827,13 @@ public: //###################################################################### // EmitV class functions -void V3EmitV::verilogForTree(AstNode* nodep, std::ostream& os) { EmitVStreamVisitor(nodep, os); } +void V3EmitV::verilogForTree(AstNode* nodep, std::ostream& os) { + { EmitVStreamVisitor{nodep, os}; } +} void V3EmitV::verilogPrefixedTree(AstNode* nodep, std::ostream& os, const string& prefix, int flWidth, AstSenTree* domainp, bool user3mark) { - EmitVPrefixedVisitor{nodep, os, prefix, flWidth, domainp, user3mark}; + { EmitVPrefixedVisitor{nodep, os, prefix, flWidth, domainp, user3mark}; } } void V3EmitV::emitvFiles() { @@ -843,7 +845,7 @@ void V3EmitV::emitvFiles() { V3OutVFile of(vfilep->name()); of.puts("// DESCR" "IPTION: Verilator generated Verilog\n"); - EmitVFileVisitor visitor{vfilep->tblockp(), &of, true, false}; + { EmitVFileVisitor{vfilep->tblockp(), &of, true, false}; } } } } @@ -853,5 +855,5 @@ void V3EmitV::debugEmitV(const string& stage) { const string filename = v3Global.opt.makeDir() + "/" + v3Global.opt.prefix() + "__" + stage + ".v"; V3OutVFile of(filename); - EmitVFileVisitor visitor{v3Global.rootp(), &of, true, true}; + { EmitVFileVisitor{v3Global.rootp(), &of, true, true}; } } diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp index 8d7634dda..2fd3e08f5 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -910,6 +910,6 @@ public: void V3Expand::expandAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ExpandVisitor visitor{nodep}; } // Destruct before checking + { ExpandVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("expand", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index 33e60c1f5..49db774bf 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -1602,7 +1602,7 @@ void V3Gate::gateAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); { GateVisitor visitor{nodep}; - GateDeassignVisitor deassign{nodep}; + GateDeassignVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("gate", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp index ad2f012cb..a530e084d 100644 --- a/src/V3GenClk.cpp +++ b/src/V3GenClk.cpp @@ -156,7 +156,7 @@ private: { // Make the new clock signals and replace any activate references // See rename, it does some AstNode::userClearTree()'s - GenClkRenameVisitor visitor{nodep, m_topModp}; + GenClkRenameVisitor{nodep, m_topModp}; } } virtual void visit(AstNodeModule* nodep) override { @@ -231,6 +231,6 @@ public: void V3GenClk::genClkAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { const GenClkReadVisitor visitor{nodep}; } // Destruct before checking + { GenClkReadVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("genclk", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Hasher.cpp b/src/V3Hasher.cpp index 1306247dd..b40dc8e9a 100644 --- a/src/V3Hasher.cpp +++ b/src/V3Hasher.cpp @@ -491,7 +491,7 @@ public: // V3Hasher methods V3Hash V3Hasher::operator()(AstNode* nodep) const { - if (!nodep->user4()) { HasherVisitor visitor{nodep}; } + if (!nodep->user4()) { HasherVisitor{nodep}; } return V3Hash(nodep->user4()); } diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index b071728cc..6fdc28ee4 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -711,8 +711,8 @@ void V3Inline::inlineAll(AstNetlist* nodep) { const AstUser1InUse m_inuser1; // output of InlineMarkVisitor, // input to InlineVisitor. // Scoped to clean up temp userN's - { InlineMarkVisitor mvisitor{nodep}; } - { InlineVisitor visitor{nodep}; } + { InlineMarkVisitor{nodep}; } + { InlineVisitor{nodep}; } // Remove all modules that were inlined // V3Dead will also clean them up, but if we have debug on, it's a good // idea to avoid dumping the hugely exploded tree. @@ -723,6 +723,6 @@ void V3Inline::inlineAll(AstNetlist* nodep) { VL_DO_DANGLING(modp->unlinkFrBack()->deleteTree(), modp); } } - { InlineIntfRefVisitor crvisitor{nodep}; } + { InlineIntfRefVisitor{nodep}; } V3Global::dumpCheckGlobalTree("inline", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index 55754113c..fcbf1e743 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -615,12 +615,12 @@ void V3Inst::checkOutputShort(AstPin* nodep) { void V3Inst::instAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { InstVisitor visitor{nodep}; } // Destruct before checking + { InstVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("inst", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } void V3Inst::dearrayAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { InstDeVisitor visitor{nodep}; } // Destruct before checking + { InstDeVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("dearray", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3Life.cpp b/src/V3Life.cpp index 38433a58e..7d3bca186 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -461,12 +461,12 @@ private: virtual void visit(AstCFunc* nodep) override { if (nodep->entryPoint()) { // Usage model 1: Simulate all C code, doing lifetime analysis - LifeVisitor visitor{nodep, m_statep}; + LifeVisitor{nodep, m_statep}; } } virtual void visit(AstNodeProcedure* nodep) override { // Usage model 2: Cleanup basic blocks - LifeVisitor visitor{nodep, m_statep}; + LifeVisitor{nodep, m_statep}; } virtual void visit(AstVar*) override {} // Accelerate virtual void visit(AstNodeStmt*) override {} // Accelerate @@ -489,7 +489,7 @@ void V3Life::lifeAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); { LifeState state; - LifeTopVisitor visitor{nodep, &state}; + LifeTopVisitor{nodep, &state}; } // Destruct before checking V3Global::dumpCheckGlobalTree("life", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index 9dded9c9d..0fb60cdad 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -271,7 +271,7 @@ private: squashAssignposts(); // Replace any node4p varscopes with the new scope - LifePostElimVisitor visitor{nodep}; + LifePostElimVisitor{nodep}; } virtual void visit(AstVarRef* nodep) override { // Consumption/generation of a variable, @@ -348,6 +348,6 @@ public: void V3LifePost::lifepostAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); // Mark redundant AssignPost - { LifePostDlyVisitor visitor{nodep}; } // Destruct before checking + { LifePostDlyVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("life_post", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp index d29440ed3..d9ef034ed 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -523,5 +523,5 @@ public: void V3LinkCells::link(AstNetlist* nodep, VInFilter* filterp, V3ParseSym* parseSymp) { UINFO(4, __FUNCTION__ << ": " << endl); - LinkCellsVisitor visitor{nodep, filterp, parseSymp}; + { LinkCellsVisitor{nodep, filterp, parseSymp}; } } diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 31e2b9815..fc70c4945 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -3075,5 +3075,5 @@ void V3LinkDot::linkDotGuts(AstNetlist* rootp, VLinkDotStep step) { state.computeIfaceVarSyms(); state.computeScopeAliases(); state.dump(); - LinkDotResolveVisitor visitorb{rootp, &state}; + { LinkDotResolveVisitor{rootp, &state}; } } diff --git a/src/V3LinkInc.cpp b/src/V3LinkInc.cpp index 1480dc3dc..b27eaac91 100644 --- a/src/V3LinkInc.cpp +++ b/src/V3LinkInc.cpp @@ -245,6 +245,6 @@ public: void V3LinkInc::linkIncrements(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { LinkIncVisitor bvisitor{nodep}; } // Destruct before checking + { LinkIncVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("linkInc", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp index 20bacaf38..a2626bc03 100644 --- a/src/V3LinkJump.cpp +++ b/src/V3LinkJump.cpp @@ -287,6 +287,6 @@ public: void V3LinkJump::linkJump(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { LinkJumpVisitor bvisitor{nodep}; } // Destruct before checking + { LinkJumpVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("link", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp index 29b3bf5cd..05f546502 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -298,12 +298,12 @@ public: void V3LinkLValue::linkLValue(AstNetlist* nodep) { UINFO(4, __FUNCTION__ << ": " << endl); - { LinkLValueVisitor visitor{nodep, VAccess::NOCHANGE}; } // Destruct before checking + { LinkLValueVisitor{nodep, VAccess::NOCHANGE}; } // Destruct before checking V3Global::dumpCheckGlobalTree("linklvalue", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } void V3LinkLValue::linkLValueSet(AstNode* nodep) { // Called by later link functions when it is known a node needs // to be converted to a lvalue. UINFO(9, __FUNCTION__ << ": " << endl); - LinkLValueVisitor visitor{nodep, VAccess::WRITE}; + { LinkLValueVisitor{nodep, VAccess::WRITE}; } } diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp index 305150cb7..5952ea46f 100644 --- a/src/V3LinkParse.cpp +++ b/src/V3LinkParse.cpp @@ -674,6 +674,6 @@ public: void V3LinkParse::linkParse(AstNetlist* rootp) { UINFO(4, __FUNCTION__ << ": " << endl); - { LinkParseVisitor visitor{rootp}; } // Destruct before checking + { LinkParseVisitor{rootp}; } // Destruct before checking V3Global::dumpCheckGlobalTree("linkparse", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index d013ab90e..a570bfec6 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -585,7 +585,7 @@ void V3LinkResolve::linkResolve(AstNetlist* rootp) { UINFO(4, __FUNCTION__ << ": " << endl); { LinkResolveVisitor visitor{rootp}; - LinkBotupVisitor visitorb{rootp}; + LinkBotupVisitor{rootp}; } // Destruct before checking V3Global::dumpCheckGlobalTree("linkresolve", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp index c8f8289d6..6b538c4c7 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -201,6 +201,6 @@ public: void V3Localize::localizeAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { LocalizeVisitor visitor{nodep}; } // Destruct before checking + { LocalizeVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("localize", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3MergeCond.cpp b/src/V3MergeCond.cpp index 1c01230e9..8172aeff4 100644 --- a/src/V3MergeCond.cpp +++ b/src/V3MergeCond.cpp @@ -537,6 +537,6 @@ public: void V3MergeCond::mergeAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { MergeCondVisitor visitor{nodep}; } + { MergeCondVisitor{nodep}; } V3Global::dumpCheckGlobalTree("merge_cond", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3Name.cpp b/src/V3Name.cpp index 7d1537792..5e1c13239 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -142,6 +142,6 @@ public: void V3Name::nameAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { NameVisitor visitor{nodep}; } // Destruct before checking + { NameVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("name", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3Param.cpp b/src/V3Param.cpp index 45f3727fd..4583c32c0 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -1201,6 +1201,6 @@ public: void V3Param::param(AstNetlist* rootp) { UINFO(2, __FUNCTION__ << ": " << endl); - { ParamVisitor visitor{rootp}; } // Destruct before checking + { ParamVisitor{rootp}; } // Destruct before checking V3Global::dumpCheckGlobalTree("param", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index 30116e97e..24babc53c 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -430,6 +430,6 @@ public: void V3Premit::premitAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { PremitVisitor visitor{nodep}; } // Destruct before checking + { PremitVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("premit", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Randomize.cpp b/src/V3Randomize.cpp index e3b4ab315..d1241cf08 100644 --- a/src/V3Randomize.cpp +++ b/src/V3Randomize.cpp @@ -254,7 +254,7 @@ void V3Randomize::randomizeNetlist(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); { RandomizeMarkVisitor markVisitor{nodep}; - RandomizeVisitor visitor{nodep}; + RandomizeVisitor{nodep}; } V3Global::dumpCheckGlobalTree("randomize", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp index 6b3154f0b..77508429d 100644 --- a/src/V3Reloop.cpp +++ b/src/V3Reloop.cpp @@ -267,6 +267,6 @@ public: void V3Reloop::reloopAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ReloopVisitor visitor{nodep}; } // Destruct before checking + { ReloopVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("reloop", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); } diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index 788c2a617..6b31c84c9 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -402,7 +402,7 @@ void V3Scope::scopeAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); { ScopeVisitor visitor{nodep}; - ScopeCleanupVisitor cleanVisitor{nodep}; + ScopeCleanupVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("scope", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp index f2c24fd07..1c220d4fa 100644 --- a/src/V3Slice.cpp +++ b/src/V3Slice.cpp @@ -237,6 +237,6 @@ public: void V3Slice::sliceAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { SliceVisitor visitor{nodep}; } // Destruct before checking + { SliceVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("slice", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Split.cpp b/src/V3Split.cpp index 2e4e4608d..b4e59315b 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -968,11 +968,11 @@ private: void V3Split::splitReorderAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { ReorderVisitor visitor{nodep}; } // Destruct before checking + { ReorderVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("reorder", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } void V3Split::splitAlwaysAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { SplitVisitor visitor{nodep}; } // Destruct before checking + { SplitVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("split", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp index bf7f0c0cc..b87e3bcb1 100644 --- a/src/V3SplitAs.cpp +++ b/src/V3SplitAs.cpp @@ -194,6 +194,6 @@ public: void V3SplitAs::splitAsAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { SplitAsVisitor visitor{nodep}; } // Destruct before checking + { SplitAsVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("splitas", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3SplitVar.cpp b/src/V3SplitVar.cpp index 60c845d19..38c32fc4f 100644 --- a/src/V3SplitVar.cpp +++ b/src/V3SplitVar.cpp @@ -1259,7 +1259,7 @@ void V3SplitVar::splitVariable(AstNetlist* nodep) { refs = visitor.getPackedVarRefs(); } V3Global::dumpCheckGlobalTree("split_var", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 9); - { SplitPackedVarVisitor visitor{nodep, refs}; } + { SplitPackedVarVisitor{nodep, refs}; } V3Global::dumpCheckGlobalTree("split_var", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 9); } diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp index 3084b233b..7bfada996 100644 --- a/src/V3Stats.cpp +++ b/src/V3Stats.cpp @@ -279,7 +279,7 @@ public: // Top Stats class void V3Stats::statsStageAll(AstNetlist* nodep, const string& stage, bool fast) { - StatsVisitor visitor{nodep, stage, fast}; + { StatsVisitor{nodep, stage, fast}; } } void V3Stats::statsFinalAll(AstNetlist* nodep) { diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp index 356188cb4..19e44e3c7 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -381,6 +381,6 @@ public: void V3Subst::substituteAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { const SubstVisitor visitor{nodep}; } // Destruct before checking + { SubstVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("subst", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Table.cpp b/src/V3Table.cpp index 0220a2df5..85e179be6 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -425,6 +425,6 @@ void TableSimulateVisitor::varRefCb(AstVarRef* nodep) { void V3Table::tableAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { TableVisitor visitor{nodep}; } // Destruct before checking + { TableVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("table", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp index e7d17db0c..7719c77e6 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -901,6 +901,6 @@ public: void V3Trace::traceAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { TraceVisitor visitor{nodep}; } // Destruct before checking + { TraceVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("trace", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index a37ddb8c8..51535a3d1 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -360,6 +360,6 @@ public: void V3TraceDecl::traceDeclAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { TraceDeclVisitor visitor{nodep}; } // Destruct before checking + { TraceDeclVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("tracedecl", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp index a3eb01cf6..64b8d5e45 100644 --- a/src/V3Tristate.cpp +++ b/src/V3Tristate.cpp @@ -1217,7 +1217,7 @@ class TristateVisitor final : public TristateBaseVisitor { // simple, it will flip ArraySel's and such, but if the // pin is an input the earlier reconnectSimple made it // a VarRef without any ArraySel, etc - TristatePinVisitor visitor{outexprp, m_tgraph, true}; + TristatePinVisitor{outexprp, m_tgraph, true}; } if (debug() >= 9) outpinp->dumpTree(cout, "-pin-opr: "); outAssignp = V3Inst::pinReconnectSimple(outpinp, m_cellp, @@ -1428,6 +1428,6 @@ public: void V3Tristate::tristateAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { TristateVisitor visitor{nodep}; } // Destruct before checking + { TristateVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("tristate", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp index 1c2eedc90..b601b8563 100644 --- a/src/V3Undriven.cpp +++ b/src/V3Undriven.cpp @@ -461,5 +461,5 @@ public: void V3Undriven::undrivenAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - UndrivenVisitor visitor{nodep}; + { UndrivenVisitor{nodep}; } } diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index ff88d14c6..f45b9dfec 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -496,6 +496,6 @@ public: void V3Unknown::unknownAll(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { UnknownVisitor visitor{nodep}; } // Destruct before checking + { UnknownVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("unknown", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); } diff --git a/src/V3Width.cpp b/src/V3Width.cpp index 284eeab1e..494d3aa28 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -6250,6 +6250,6 @@ AstNode* V3Width::widthGenerateParamsEdit( void V3Width::widthCommit(AstNetlist* nodep) { UINFO(2, __FUNCTION__ << ": " << endl); - { WidthCommitVisitor visitor{nodep}; } // Destruct before checking + { WidthCommitVisitor{nodep}; } // Destruct before checking V3Global::dumpCheckGlobalTree("widthcommit", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); }