Changeset ffec1bf for src/InitTweak

Timestamp:

Jul 25, 2022, 2:23:28 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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:

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

src/InitTweak/GenInit.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenInit.cc --
+// GenInit.cc -- Generate initializers, and other stuff.
 //
 // Author           : Rob Schluntz
@@ -642 +642 @@
 
 ast::ConstructorInit * genCtorInit( const CodeLocation & loc, const ast::ObjectDecl * objDecl ) {
-        // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each 
+        // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each
         // constructable object
         InitExpander_new srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
         ast::ptr< ast::Expr > dstParam = new ast::VariableExpr(loc, objDecl);
-        
-        ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall( 
+
+        ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall(
                 srcParam, dstParam, loc, "?{}", objDecl );
-        ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall( 
-                nullParam, dstParam, loc, "^?{}", objDecl, 
+        ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall(
+                nullParam, dstParam, loc, "^?{}", objDecl,
                 SymTab::LoopBackward );
-        
+
         // check that either both ctor and dtor are present, or neither
         assert( (bool)ctor == (bool)dtor );
 
         if ( ctor ) {
-                // need to remember init expression, in case no ctors exist. If ctor does exist, want to 
+                // need to remember init expression, in case no ctors exist. If ctor does exist, want to
                 // use ctor expression instead of init.
-                ctor.strict_as< ast::ImplicitCtorDtorStmt >(); 
+                ctor.strict_as< ast::ImplicitCtorDtorStmt >();
                 dtor.strict_as< ast::ImplicitCtorDtorStmt >();
 

src/InitTweak/GenInit.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenInit.h --
+// GenInit.h -- Generate initializers, and other stuff.
 //
 // Author           : Rodolfo G. Esteves
@@ -29 +29 @@
         void genInit( ast::TranslationUnit & translationUnit );
 
-        /// Converts return statements into copy constructor calls on the hidden return variable
+        /// Converts return statements into copy constructor calls on the hidden return variable.
+        /// This pass must happen before auto-gen.
         void fixReturnStatements( std::list< Declaration * > & translationUnit );
         void fixReturnStatements( ast::TranslationUnit & translationUnit );