Changeset 49c9773 for src/InitTweak

Timestamp:

Jun 1, 2017, 10:58:24 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

acd738aa, d3ed39f

Parents:

6065b3aa (diff), b1d4d60 (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 plg2:software/cfa/cfa-cc

File:

• src/InitTweak/FixInit.cc (modified) (10 diffs)

src/InitTweak/FixInit.cc

@@ -20 +20 @@
 #include <unordered_map>
 #include <unordered_set>
+
 #include "InitTweak.h"
 #include "GenInit.h"
 #include "FixInit.h"
 #include "FixGlobalInit.h"
+#include "CodeGen/GenType.h"  // for warning/error messages
+#include "Common/PassVisitor.h"
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
 #include "ResolvExpr/Resolver.h"
 #include "ResolvExpr/typeops.h"
+#include "SymTab/Autogen.h"
+#include "SymTab/Indexer.h"
+#include "SynTree/AddStmtVisitor.h"
+#include "SynTree/Attribute.h"
 #include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Attribute.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
-#include "SymTab/Indexer.h"
-#include "SymTab/Autogen.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/DeclMutator.h"
-#include "SynTree/AddStmtVisitor.h"
-#include "CodeGen/GenType.h"  // for warning/error messages
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
 #include "Tuples/Tuples.h"
 
@@ -54 +56 @@
                 typedef std::unordered_map< int, int > UnqCount;
 
-                class InsertImplicitCalls final : public GenPoly::PolyMutator {
+                class InsertImplicitCalls {
                 public:
                         /// wrap function application expressions as ImplicitCopyCtorExpr nodes so that it is easy to identify which
@@ -61 +63 @@
 
                         InsertImplicitCalls( EnvMap & envMap ) : envMap( envMap ) {}
-                        typedef GenPoly::PolyMutator Parent;
-                        using Parent::mutate;
-                        virtual Expression * mutate( ApplicationExpr * appExpr ) override;
-                        virtual Expression * mutate( StmtExpr * stmtExpr ) override;
+
+                        Expression * postmutate( ApplicationExpr * appExpr );
+                        void premutate( StmtExpr * stmtExpr );
 
                         // collects environments for relevant nodes
                         EnvMap & envMap;
+                        TypeSubstitution * env; //Magically populated by the PassVisitor
                 };
 
@@ -190 +192 @@
                 };
 
-                class FixInit final : public GenPoly::PolyMutator {
+                class FixInit {
                   public:
                         /// expand each object declaration to use its constructor after it is declared.
                         static void fixInitializers( std::list< Declaration * > &translationUnit );
 
-                        typedef GenPoly::PolyMutator Parent;
-                        using Parent::mutate;
-                        virtual DeclarationWithType * mutate( ObjectDecl *objDecl ) override;
+                        DeclarationWithType * postmutate( ObjectDecl *objDecl );
 
                         std::list< Declaration * > staticDtorDecls;
+                        std::list< Statement * > stmtsToAddAfter; // found by PassVisitor
                 };
 
@@ -300 +301 @@
         namespace {
                 void InsertImplicitCalls::insert( std::list< Declaration * > & translationUnit, EnvMap & envMap ) {
-                        InsertImplicitCalls inserter( envMap );
+                        PassVisitor<InsertImplicitCalls> inserter( envMap );
                         mutateAll( translationUnit, inserter );
                 }
@@ -310 +311 @@
 
                 void FixInit::fixInitializers( std::list< Declaration * > & translationUnit ) {
-                        FixInit fixer;
+                        PassVisitor<FixInit> fixer;
 
                         // can't use mutateAll, because need to insert declarations at top-level
@@ -318 +319 @@
                                 try {
                                         *i = maybeMutate( *i, fixer );
-                                        translationUnit.splice( i, fixer.staticDtorDecls );
+                                        translationUnit.splice( i, fixer.pass.staticDtorDecls );
                                 } catch( SemanticError &e ) {
                                         e.set_location( (*i)->location );
@@ -350 +351 @@
                 }
 
-                Expression * InsertImplicitCalls::mutate( ApplicationExpr * appExpr ) {
-                        appExpr = dynamic_cast< ApplicationExpr * >( Parent::mutate( appExpr ) );
+                Expression * InsertImplicitCalls::postmutate( ApplicationExpr * appExpr ) {
                         assert( appExpr );
 
@@ -393 +393 @@
                 }
 
-                Expression * InsertImplicitCalls::mutate( StmtExpr * stmtExpr ) {
+                void InsertImplicitCalls::premutate( StmtExpr * stmtExpr ) {
                         assert( env );
                         envMap[stmtExpr] = env;
-                        return Parent::mutate( stmtExpr );
                 }
 
@@ -696 +695 @@
                 }
 
-                DeclarationWithType *FixInit::mutate( ObjectDecl *objDecl ) {
-                        // first recursively handle pieces of ObjectDecl so that they aren't missed by other visitors when the init
-                        // is removed from the ObjectDecl
-                        objDecl = dynamic_cast< ObjectDecl * >( Parent::mutate( objDecl ) );
+                DeclarationWithType *FixInit::postmutate( ObjectDecl *objDecl ) {
+                        // since this removes the init field from objDecl, it must occur after children are mutated (i.e. postmutate)
                         if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                                 // a decision should have been made by the resolver, so ctor and init are not both non-NULL