Changeset 9a707e4e

Timestamp:

Sep 15, 2017, 5:05:48 PM (7 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:

eada3cf

Parents:

a4ca48c

Message:

Convert GenStructMemberCalls? to PassVisitor?

File:

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

src/InitTweak/FixInit.cc

@@ -238 +238 @@
                 };
 
-                class GenStructMemberCalls final : public SymTab::Indexer {
-                  public:
-                        typedef Indexer Parent;
+                struct GenStructMemberCalls final : public WithGuards, public WithShortCircuiting, public WithIndexer {
                         /// generate default/copy ctor and dtor calls for user-defined struct ctor/dtors
                         /// for any member that is missing a corresponding ctor/dtor call.
@@ -246 +244 @@
                         static void generate( std::list< Declaration * > & translationUnit );
 
-                        using Parent::visit;
-
-                        virtual void visit( FunctionDecl * funcDecl ) override;
-
-                        virtual void visit( MemberExpr * memberExpr ) override;
-                        virtual void visit( ApplicationExpr * appExpr ) override;
+                        void previsit( FunctionDecl * funcDecl );
+                        void postvisit( FunctionDecl * funcDecl );
+
+                        void previsit( MemberExpr * memberExpr );
+                        void previsit( ApplicationExpr * appExpr );
 
                         SemanticError errors;
@@ -360 +357 @@
 
                 void GenStructMemberCalls::generate( std::list< Declaration * > & translationUnit ) {
-                        GenStructMemberCalls warner;
+                        PassVisitor<GenStructMemberCalls> warner;
                         acceptAll( translationUnit, warner );
                 }
@@ -978 +975 @@
                 }
 
-                void GenStructMemberCalls::visit( FunctionDecl * funcDecl ) {
-                        ValueGuard< FunctionDecl * > oldFunction( funcDecl );
-                        ValueGuard< std::set< DeclarationWithType * > > oldUnhandled( unhandled );
-                        ValueGuard< std::map< DeclarationWithType *, CodeLocation > > oldUsedUninit( usedUninit );
-                        ValueGuard< ObjectDecl * > oldThisParam( thisParam );
-                        ValueGuard< bool > oldIsCtor( isCtor );
-                        ValueGuard< StructDecl * > oldStructDecl( structDecl );
+                void GenStructMemberCalls::previsit( FunctionDecl * funcDecl ) {
+                        GuardValue( funcDecl );
+                        GuardValue( unhandled );
+                        GuardValue( usedUninit );
+                        GuardValue( thisParam );
+                        GuardValue( isCtor );
+                        GuardValue( structDecl );
                         errors = SemanticError();  // clear previous errors
 
@@ -1010 +1007 @@
                                 }
                         }
-                        Parent::visit( function );
-
+                }
+
+                void addIds( SymTab::Indexer & indexer, const std::list< DeclarationWithType * > & decls ) {
+                        for ( auto d : decls ) {
+                                indexer.addId( d );
+                        }
+                }
+
+                void addTypes( SymTab::Indexer & indexer, const std::list< TypeDecl * > & tds ) {
+                        for ( auto td : tds ) {
+                                indexer.addType( td );
+                                addIds( indexer, td->assertions );
+                        }
+                }
+
+                void GenStructMemberCalls::postvisit( FunctionDecl * funcDecl ) {
                         // remove the unhandled objects from usedUninit, because a call is inserted
                         // to handle them - only objects that are later constructed are used uninitialized.
@@ -1032 +1043 @@
                         if ( ! unhandled.empty() ) {
                                 // need to explicitly re-add function parameters to the indexer in order to resolve copy constructors
-                                enterScope();
-                                maybeAccept( function->get_functionType(), *this );
+                                auto guard = makeFuncGuard( [this]() { indexer.enterScope(); }, [this]() { indexer.leaveScope(); } );
+                                addTypes( indexer, function->type->forall );
+                                addIds( indexer, function->type->returnVals );
+                                addIds( indexer, function->type->parameters );
 
                                 // need to iterate through members in reverse in order for
@@ -1063 +1076 @@
                                                 Statement * callStmt = stmt.front();
 
-                                                MutatingResolver resolver( *this );
+                                                MutatingResolver resolver( indexer );
                                                 try {
                                                         callStmt->acceptMutator( resolver );
@@ -1077 +1090 @@
                                         }
                                 }
-                                leaveScope();
                         }
                         if (! errors.isEmpty()) {
@@ -1107 +1119 @@
                 }
 
-                void GenStructMemberCalls::visit( ApplicationExpr * appExpr ) {
-                        if ( ! checkWarnings( function ) ) return;
+                void GenStructMemberCalls::previsit( ApplicationExpr * appExpr ) {
+                        if ( ! checkWarnings( function ) ) {
+                                visit_children = false;
+                                return;
+                        }
 
                         std::string fname = getFunctionName( appExpr );
@@ -1127 +1142 @@
                                 }
                         }
-                        Parent::visit( appExpr );
-                }
-
-                void GenStructMemberCalls::visit( MemberExpr * memberExpr ) {
-                        if ( ! checkWarnings( function ) ) return;
-                        if ( ! isCtor ) return;
+                }
+
+                void GenStructMemberCalls::previsit( MemberExpr * memberExpr ) {
+                        if ( ! checkWarnings( function ) || ! isCtor ) {
+                                visit_children = false;
+                                return;
+                        }
 
                         if ( isThisExpression( memberExpr->get_aggregate(), thisParam ) ) {
@@ -1140 +1156 @@
                                 }
                         }
-                        Parent::visit( memberExpr );
                 }