Changeset e5d9274 for src/InitTweak/GenInit.cc

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

File:

• src/InitTweak/GenInit.cc (modified) (2 diffs)

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;
         }