Changeset a0fdbd5 for src/InitTweak

Timestamp:

Apr 28, 2016, 12:32:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

fea7ca7

Parents:

84bb4d9

Message:

remove RemoveInit?'s ObjectDecl? mutate which duplicates constructor calls on polymorphic objects, change name of RemoveInit? files to more accurate GenInit?

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (2 diffs)
• GenInit.cc (moved) (moved from src/InitTweak/RemoveInit.cc) (5 diffs)
• GenInit.h (moved) (moved from src/InitTweak/RemoveInit.h) (2 diffs)
• module.mk (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:08:44 2016
+// Last Modified On : Thu Apr 28 12:25:14 2016
 // Update Count     : 30
 //
@@ -16 +16 @@
 #include <stack>
 #include <list>
-#include "RemoveInit.h"
+#include "FixInit.h"
 #include "ResolvExpr/Resolver.h"
 #include "ResolvExpr/typeops.h"

src/InitTweak/GenInit.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RemoveInit.cc --
+// GenInit.cc --
 //
 // Author           : Rob Schluntz
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:09:36 2016
+// Last Modified On : Thu Apr 28 12:26:47 2016
 // Update Count     : 166
 //
@@ -16 +16 @@
 #include <stack>
 #include <list>
-#include "RemoveInit.h"
+#include "GenInit.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Type.h"
@@ -32 +32 @@
         }
 
-        class RemoveInit : public GenPoly::PolyMutator {
+        class ReturnFixer : public GenPoly::PolyMutator {
           public:
-                /// removes and replaces initialization for polymorphic value objects
-                /// with assignment (TODO: constructor) statements.
-                /// also consistently allocates a temporary variable for the return value
-                /// of a function so that anything which the resolver decides can be assigned
+                /// consistently allocates a temporary variable for the return value
+                /// of a function so that anything which the resolver decides can be constructed
                 /// into the return type of a function can be returned.
-                static void removeInitializers( std::list< Declaration * > &translationUnit );
-
-                RemoveInit();
-
-                virtual ObjectDecl * mutate( ObjectDecl *objDecl );
+                static void makeReturnTemp( std::list< Declaration * > &translationUnit );
+
+                ReturnFixer();
+
                 virtual DeclarationWithType * mutate( FunctionDecl *functionDecl );
 
@@ -79 +76 @@
         };
 
-        void tweak( std::list< Declaration * > & translationUnit ) {
-                RemoveInit::removeInitializers( translationUnit );
+        void genInit( std::list< Declaration * > & translationUnit ) {
+                ReturnFixer::makeReturnTemp( translationUnit );
                 CtorDtor::generateCtorDtor( translationUnit );
         }
 
-        void RemoveInit::removeInitializers( std::list< Declaration * > & translationUnit ) {
-                RemoveInit remover;
-                mutateAll( translationUnit, remover );
-        }
-
-        RemoveInit::RemoveInit() : tempNamer( "_retVal" ) {}
-
-        // in the case where an object has an initializer and a polymorphic type, insert an assignment immediately after the
-        // declaration. This will (seemingly) cause the later phases to do the right thing with the assignment
-        ObjectDecl *RemoveInit::mutate( ObjectDecl *objDecl ) {
-                if (objDecl->get_init() && dynamic_cast<TypeInstType*>(objDecl->get_type())) {
-                        if (SingleInit * single = dynamic_cast<SingleInit*>(objDecl->get_init())) {
-                                // xxx this can be more complicated - consider ListInit
-                                UntypedExpr *assign = new UntypedExpr( new NameExpr( "?{}" ) );
-                                assign->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
-                                assign->get_args().push_back( single->get_value()->clone() );
-                                stmtsToAddAfter.push_back(new ExprStmt(noLabels, assign));
-                        } // if
-                } // if
-                return objDecl;
-        }
-
-        Statement *RemoveInit::mutate( ReturnStmt *returnStmt ) {
+        void ReturnFixer::makeReturnTemp( std::list< Declaration * > & translationUnit ) {
+                ReturnFixer fixer;
+                mutateAll( translationUnit, fixer );
+        }
+
+        ReturnFixer::ReturnFixer() : tempNamer( "_retVal" ) {}
+
+        Statement *ReturnFixer::mutate( ReturnStmt *returnStmt ) {
                 // update for multiple return values
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
@@ -128 +110 @@
         }
 
-        DeclarationWithType* RemoveInit::mutate( FunctionDecl *functionDecl ) {
+        DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
                 std::list<DeclarationWithType*> oldReturnVals = returnVals;
                 std::string oldFuncName = funcName;

src/InitTweak/GenInit.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jan 11 16:02:44 2016
+// Last Modified On : Thu Apr 28 12:22:09 2016
 // Update Count     : 3
 //
 
-#ifndef REMOVE_INIT_H
-#define REMOVE_INIT_H
+#ifndef GEN_INIT_H
+#define GEN_INIT_H
 
 #include <string>
@@ -25 +25 @@
 
 namespace InitTweak {
-        /// Adds assignment statements for polymorphic type initializers
-        void tweak( std::list< Declaration * > & translationUnit );
+        /// Adds return value temporaries and wraps Initializers in ConstructorInit nodes
+        void genInit( std::list< Declaration * > & translationUnit );
 } // namespace
 

src/InitTweak/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Rob Schluntz
-## Last Modified On : Wed Jan 13 16:29:03 2016
+## Last Modified On : Thu Apr 28 12:23:17 2016
 ## Update Count     : 3
 ###############################################################################
 
-SRC += InitTweak/RemoveInit.cc \
+SRC += InitTweak/GenInit.cc \
         InitTweak/FixInit.cc