Changeset 365c8dcb for src/InitTweak

Timestamp:

Apr 14, 2022, 3:00:28 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

bfd5512

Parents:

30d91e4 (diff), 4ec9513 (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' into enum

Location:

src/InitTweak

Files:

• GenInit.cc (modified) (2 diffs)
• GenInit.h (modified) (2 diffs)

src/InitTweak/GenInit.cc

@@ -402 +402 @@
                                         retVal->location, "?{}", retVal, stmt->expr );
                                 assertf( ctorStmt,
-                                        "ReturnFixer: genCtorDtor returned nllptr: %s / %s",
+                                        "ReturnFixer: genCtorDtor returned nullptr: %s / %s",
                                         toString( retVal ).c_str(),
                                         toString( stmt->expr ).c_str() );
-                                        stmtsToAddBefore.push_back( ctorStmt );
+                                stmtsToAddBefore.push_back( ctorStmt );
 
                                 // Return the retVal object.
@@ -421 +421 @@
         void genInit( ast::TranslationUnit & transUnit ) {
                 ast::Pass<HoistArrayDimension_NoResolve_New>::run( transUnit );
+                ast::Pass<ReturnFixer_New>::run( transUnit );
+        }
+
+        void fixReturnStatements( ast::TranslationUnit & transUnit ) {
                 ast::Pass<ReturnFixer_New>::run( transUnit );
         }

src/InitTweak/GenInit.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 22 16:08:00 2021
-// Update Count     : 6
+// Last Modified On : Fri Mar 18 14:22:00 2022
+// Update Count     : 7
 //
 
@@ -31 +31 @@
         /// Converts return statements into copy constructor calls on the hidden return variable
         void fixReturnStatements( std::list< Declaration * > & translationUnit );
+        void fixReturnStatements( ast::TranslationUnit & translationUnit );
 
         /// generates a single ctor/dtor statement using objDecl as the 'this' parameter and arg as the optional argument