Changeset 10a9479d for src/InitTweak

Timestamp:

Nov 23, 2024, 8:28:37 PM (14 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

956b389

Parents:

b006c51e (diff), de7b7a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/InitTweak

Files:

• FixInit.cpp (modified) (4 diffs)
• GenInit.cpp (modified) (2 diffs)

src/InitTweak/FixInit.cpp

@@ -105 +105 @@
 /// generate/resolve copy construction expressions for each, and generate/resolve destructors for both
 /// arguments and return value temporaries
-struct ResolveCopyCtors final : public ast::WithGuards, public ast::WithStmtsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithVisitorRef<ResolveCopyCtors>, public ast::WithConstTranslationUnit {
+struct ResolveCopyCtors final : public ast::WithGuards, public ast::WithStmtsToAdd, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithVisitorRef<ResolveCopyCtors>, public ast::WithConstTranslationUnit {
         const ast::Expr * postvisit( const ast::ImplicitCopyCtorExpr * impCpCtorExpr );
         const ast::StmtExpr * previsit( const ast::StmtExpr * stmtExpr );
@@ -177 +177 @@
 /// insert destructor calls at the appropriate places.  must happen before CtorInit nodes are removed
 /// (currently by FixInit)
-struct InsertDtors final : public ObjDeclCollector, public ast::WithStmtsToAdd<> {
+struct InsertDtors final : public ObjDeclCollector, public ast::WithStmtsToAdd {
         InsertDtors( ast::Pass<LabelFinder> & finder ) : finder( finder ), labelVars( finder.core.vars ) {}
 
@@ -194 +194 @@
 
 /// expand each object declaration to use its constructor after it is declared.
-struct FixInit : public ast::WithStmtsToAdd<> {
+struct FixInit : public ast::WithStmtsToAdd {
         static void fixInitializers( ast::TranslationUnit &translationUnit );
 
@@ -230 +230 @@
 
 /// expands ConstructorExpr nodes into comma expressions, using a temporary for the first argument
-struct FixCtorExprs final : public ast::WithDeclsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithConstTranslationUnit {
+struct FixCtorExprs final : public ast::WithDeclsToAdd, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithConstTranslationUnit {
         const ast::Expr * postvisit( const ast::ConstructorExpr * ctorExpr );
 };

src/InitTweak/GenInit.cpp

@@ -46 +46 @@
         // Outer pass finds declarations, for their type could wrap a type that needs hoisting
         struct HoistArrayDimension_NoResolve final :
-                        public ast::WithDeclsToAdd<>, public ast::WithShortCircuiting,
+                        public ast::WithDeclsToAdd, public ast::WithShortCircuiting,
                         public ast::WithGuards, public ast::WithConstTranslationUnit,
                         public ast::WithVisitorRef<HoistArrayDimension_NoResolve>,
@@ -205 +205 @@
 
         struct ReturnFixer final :
-                        public ast::WithStmtsToAdd<>, ast::WithGuards, ast::WithShortCircuiting {
+                        public ast::WithStmtsToAdd, ast::WithGuards, ast::WithShortCircuiting {
                 void previsit( const ast::FunctionDecl * decl );
                 const ast::ReturnStmt * previsit( const ast::ReturnStmt * stmt );