Changeset e5d9274 for src/InitTweak

Timestamp:

Jun 2, 2022, 3:11:21 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

ced5e2a

Parents:

015925a (diff), fc134a48 (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:

• FixInitNew.cpp (modified) (4 diffs)
• GenInit.cc (modified) (2 diffs)
• module.mk (modified) (2 diffs)

src/InitTweak/FixInitNew.cpp

@@ -454 +454 @@
 
                 auto expr = new ast::ImplicitCopyCtorExpr( appExpr->location, mutExpr );
-                // Move the type substitution to the new top-level, if it is attached to the appExpr.
-                // Ensure it is not deleted with the ImplicitCopyCtorExpr by removing it before deletion.
-                // The substitution is needed to obtain the type of temporary variables so that copy constructor
-                // calls can be resolved.
+                // Move the type substitution to the new top-level. The substitution
+                // is needed to obtain the type of temporary variables so that copy
+                // constructor calls can be resolved.
                 assert( typeSubs );
-                // assert (mutExpr->env);
                 expr->env = tmp;
-                // mutExpr->env = nullptr;
-                //std::swap( expr->env, appExpr->env );
                 return expr;
         }
 
         void ResolveCopyCtors::previsit(const ast::Expr * expr) {
-                if (expr->env) {
-                        GuardValue(env);
-                        GuardValue(envModified);
-                        env = expr->env->clone();
-                        envModified = false;
-                }
+                if ( nullptr == expr->env ) {
+                        return;
+                }
+                GuardValue( env ) = expr->env->clone();
+                GuardValue( envModified ) = false;
         }
 
         const ast::Expr * ResolveCopyCtors::postvisit(const ast::Expr * expr) {
-                if (expr->env) {
-                        if (envModified) {
-                                auto mutExpr = mutate(expr);
-                                mutExpr->env = env;
-                                return mutExpr;
-                        }
-                        else {
-                                // env was not mutated, skip and delete the shallow copy
-                                delete env;
-                                return expr;
-                        }
-                }
-                else {
+                // No local environment, skip.
+                if ( nullptr == expr->env ) {
+                        return expr;
+                // Environment was modified, mutate and replace.
+                } else if ( envModified ) {
+                        auto mutExpr = mutate(expr);
+                        mutExpr->env = env;
+                        return mutExpr;
+                // Environment was not mutated, delete the shallow copy before guard.
+                } else {
+                        delete env;
                         return expr;
                 }
@@ -497 +490 @@
         const ast::Expr * ResolveCopyCtors::makeCtorDtor( const std::string & fname, const ast::ObjectDecl * var, const ast::Expr * cpArg ) {
                 assert( var );
-                assert (var->isManaged());
-                assert (!cpArg || cpArg->isManaged());
+                assert( var->isManaged() );
+                assert( !cpArg || cpArg->isManaged() );
                 // arrays are not copy constructed, so this should always be an ExprStmt
                 ast::ptr< ast::Stmt > stmt = genCtorDtor(var->location, fname, var, cpArg );
@@ -504 +497 @@
                 auto exprStmt = stmt.strict_as<ast::ImplicitCtorDtorStmt>()->callStmt.strict_as<ast::ExprStmt>();
                 ast::ptr<ast::Expr> untyped = exprStmt->expr; // take ownership of expr
-                // exprStmt->expr = nullptr;
 
                 // resolve copy constructor
@@ -516 +508 @@
                         env->add( *resolved->env );
                         envModified = true;
-                        // delete resolved->env;
                         auto mut = mutate(resolved.get());
                         assertf(mut == resolved.get(), "newly resolved expression must be unique");
                         mut->env = nullptr;
                 } // if
-                // delete stmt;
                 if ( auto assign = resolved.as<ast::TupleAssignExpr>() ) {
                         // fix newly generated StmtExpr

src/InitTweak/GenInit.cc

@@ -368 +368 @@
 
         struct ReturnFixer_New final :
-                        public ast::WithStmtsToAdd<>, ast::WithGuards {
+                        public ast::WithStmtsToAdd<>, ast::WithGuards, ast::WithShortCircuiting {
                 void previsit( const ast::FunctionDecl * decl );
                 const ast::ReturnStmt * previsit( const ast::ReturnStmt * stmt );
@@ -376 +376 @@
 
         void ReturnFixer_New::previsit( const ast::FunctionDecl * decl ) {
+                if (decl->linkage == ast::Linkage::Intrinsic) visit_children = false;
                 GuardValue( funcDecl ) = decl;
         }

src/InitTweak/module.mk

@@ -10 +10 @@
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Rob Schluntz
-## Last Modified On : Fri May 13 11:36:24 2016
-## Update Count     : 3
+## Last Modified By : Andrew Beach
+## Last Modified On : Tue May 17 14:31:00 2022
+## Update Count     : 4
 ###############################################################################
 
-SRC += \
-        InitTweak/FixGlobalInit.cc \
-        InitTweak/FixGlobalInit.h \
-        InitTweak/FixInit.cc \
-        InitTweak/FixInit.h \
-        InitTweak/GenInit.cc \
-        InitTweak/GenInit.h \
-        InitTweak/InitTweak.cc \
-        InitTweak/InitTweak.h \
-        InitTweak/FixInitNew.cpp
-
-SRCDEMANGLE += \
+SRC_INITTWEAK = \
         InitTweak/GenInit.cc \
         InitTweak/GenInit.h \
@@ -32 +21 @@
         InitTweak/InitTweak.h
 
+SRC += $(SRC_INITTWEAK) \
+        InitTweak/FixGlobalInit.cc \
+        InitTweak/FixGlobalInit.h \
+        InitTweak/FixInit.cc \
+        InitTweak/FixInit.h \
+        InitTweak/FixInitNew.cpp
+
+SRCDEMANGLE += $(SRC_INITTWEAK)