Changeset 7bd712d

Timestamp:

Jun 15, 2017, 3:33:44 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

4eb31f2b

Parents:

637568b (diff), 7b6ca2e (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) (5 diffs)

src/InitTweak/GenInit.cc

@@ -16 +16 @@
 #include <stack>
 #include <list>
+
+#include "InitTweak.h"
 #include "GenInit.h"
-#include "InitTweak.h"
+
+#include "Common/PassVisitor.h"
+
 #include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+
 #include "SymTab/Autogen.h"
 #include "SymTab/Mangler.h"
+
+#include "GenPoly/DeclMutator.h"
 #include "GenPoly/PolyMutator.h"
-#include "GenPoly/DeclMutator.h"
 #include "GenPoly/ScopedSet.h"
+
 #include "ResolvExpr/typeops.h"
 
@@ -37 +44 @@
         }
 
-        class ReturnFixer final : public GenPoly::PolyMutator {
+        class ReturnFixer {
           public:
                 /// consistently allocates a temporary variable for the return value
@@ -44 +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 );
+
+                at_cleanup_t at_cleanup;
+                std::list< Statement * > stmtsToAddBefore;
 
           protected:
@@ -129 +137 @@
 
         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 );
@@ -144 +152 @@
                         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( this, ftype );
+                GuardValue( this, funcName );
 
                 ftype = functionDecl->get_functionType();
                 funcName = functionDecl->get_name();
-                return Parent::mutate( functionDecl );
         }