Changeset 436c0de for src/InitTweak

Timestamp:

Jun 18, 2017, 9:22:22 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/InitTweak/GenInit.cc

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (1 diff)
• GenInit.cc (modified) (4 diffs)

src/InitTweak/FixInit.cc

@@ -902 +902 @@
                 }
 
-                void InsertDtors::visit( ReturnStmt * returnStmt ) {
+                void InsertDtors::visit( __attribute((unused)) ReturnStmt * returnStmt ) {
                         // return exits all scopes, so dump destructors for all scopes
                         for ( OrderedDecls & od : reverseDeclOrder ) {

src/InitTweak/GenInit.cc

@@ -39 +39 @@
 
 namespace InitTweak {
-        class ReturnFixer final : public GenPoly::PolyMutator {
+        namespace {
+                const std::list<Label> noLabels;
+                const std::list<Expression *> noDesignators;
+        }
+
+        class ReturnFixer : public WithStmtsToAdd, public WithScopes {
           public:
                 /// consistently allocates a temporary variable for the return value
@@ -46 +51 @@
                 static void makeReturnTemp( std::list< Declaration * > &translationUnit );
 
-                typedef GenPoly::PolyMutator Parent;
-                using Parent::mutate;
-                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl ) override;
-                virtual Statement * mutate( ReturnStmt * returnStmt ) override;
+                void premutate( FunctionDecl *functionDecl );
+                void premutate( ReturnStmt * returnStmt );
 
           protected:
@@ -131 +134 @@
 
         void ReturnFixer::makeReturnTemp( std::list< Declaration * > & translationUnit ) {
-                ReturnFixer fixer;
+                PassVisitor<ReturnFixer> fixer;
                 mutateAll( translationUnit, fixer );
         }
 
-        Statement *ReturnFixer::mutate( ReturnStmt *returnStmt ) {
+        void ReturnFixer::premutate( ReturnStmt *returnStmt ) {
                 std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
@@ -146 +149 @@
                         construct->get_args().push_back( new AddressExpr( new VariableExpr( returnVals.front() ) ) );
                         construct->get_args().push_back( returnStmt->get_expr() );
-                        stmtsToAdd.push_back(new ExprStmt(noLabels, construct));
+                        stmtsToAddBefore.push_back(new ExprStmt(noLabels, construct));
 
                         // return the retVal object
                         returnStmt->set_expr( new VariableExpr( returnVals.front() ) );
                 } // if
-                return returnStmt;
-        }
-
-        DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
-                ValueGuard< FunctionType * > oldFtype( ftype );
-                ValueGuard< std::string > oldFuncName( funcName );
+        }
+
+        void ReturnFixer::premutate( FunctionDecl *functionDecl ) {
+                GuardValue( ftype );
+                GuardValue( funcName );
 
                 ftype = functionDecl->get_functionType();
                 funcName = functionDecl->get_name();
-                return Parent::mutate( functionDecl );
         }