Changeset 1fbeebd

Timestamp:

Nov 30, 2017, 5:37:15 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:

ef3d798

Parents:

1cb934d

git-author:

Rob Schluntz <rschlunt@…> (11/30/17 17:12:26)

git-committer:

Rob Schluntz <rschlunt@…> (11/30/17 17:37:15)

Message:

Convert LabelFixer? to PassVisitor?

Location:

src

Files:

• ControlStruct/LabelFixer.cc (modified) (3 diffs)
• ControlStruct/LabelFixer.h (modified) (3 diffs)
• ControlStruct/Mutate.cc (modified) (2 diffs)
• InitTweak/InitTweak.cc (modified) (1 diff)

src/ControlStruct/LabelFixer.cc

@@ -37 +37 @@
         }
 
-        void LabelFixer::visit( FunctionDecl *functionDecl ) {
+        void LabelFixer::previsit( FunctionDecl * ) {
                 // need to go into a nested function in a fresh state
-                std::map < Label, Entry *> oldLabelTable = labelTable;
+                GuardValue( labelTable );
                 labelTable.clear();
+        }
 
-                maybeAccept( functionDecl->get_statements(), *this );
-
+        void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
                 MLEMutator mlemut( resolveJumps(), generator );
                 functionDecl->acceptMutator( mlemut );
-
-                // and remember the outer function's labels when
-                // returning to it
-                labelTable = oldLabelTable;
         }
 
         // prune to at most one label definition for each statement
-        void LabelFixer::visit( Statement *stmt ) {
+        void LabelFixer::previsit( Statement *stmt ) {
                 std::list< Label > &labels = stmt->get_labels();
 
@@ -62 +58 @@
         }
 
-        void LabelFixer::visit( BranchStmt *branchStmt ) {
-                visit ( ( Statement * )branchStmt );
+        void LabelFixer::previsit( BranchStmt *branchStmt ) {
+                previsit( ( Statement *)branchStmt );
 
                 // for labeled branches, add an entry to the label table
@@ -72 +68 @@
         }
 
-        void LabelFixer::visit( UntypedExpr *untyped ) {
-                if ( NameExpr * func = dynamic_cast< NameExpr * >( untyped->get_function() ) ) {
-                        if ( func->get_name() == "&&" ) {
-                                NameExpr * arg = dynamic_cast< NameExpr * >( untyped->get_args().front() );
-                                Label target = arg->get_name();
-                                assert( target != "" );
-                                setLabelsUsg( target, untyped );
-                        } else {
-                                Visitor::visit( untyped );
-                        }
-                }
+        void LabelFixer::previsit( LabelAddressExpr * addrExpr ) {
+                Label & target = addrExpr->arg;
+                assert( target != "" );
+                setLabelsUsg( target, addrExpr );
         }
 

src/ControlStruct/LabelFixer.h

@@ -19 +19 @@
 #include <map>                     // for map
 
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "SynTree/Label.h"         // for Label
@@ -26 +27 @@
 namespace ControlStruct {
         /// normalizes label definitions and generates multi-level exit labels
-class LabelGenerator;
+        class LabelGenerator;
 
-        class LabelFixer final : public Visitor {
-                typedef Visitor Parent;
+        class LabelFixer final : public WithGuards {
           public:
                 LabelFixer( LabelGenerator *gen = 0 );
@@ -35 +35 @@
                 std::map < Label, Statement * > *resolveJumps() throw ( SemanticError );
 
-                using Visitor::visit;
-
                 // Declarations
-                virtual void visit( FunctionDecl *functionDecl ) override;
+                void previsit( FunctionDecl *functionDecl );
+                void postvisit( FunctionDecl *functionDecl );
 
                 // Statements
-                void visit( Statement *stmt );
+                void previsit( Statement *stmt );
+                void previsit( BranchStmt *branchStmt );
 
-                virtual void visit( CompoundStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( NullStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ExprStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( IfStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( WhileStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ForStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( SwitchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( CaseStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( ReturnStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( TryStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( CatchStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( DeclStmt *stmt ) override { visit( (Statement *)stmt ); return Parent::visit( stmt ); }
-                virtual void visit( BranchStmt *branchStmt ) override;
-                virtual void visit( UntypedExpr *untyped ) override;
+                // Expressions
+                void previsit( LabelAddressExpr *addrExpr );
 
                 Label setLabelsDef( std::list< Label > &, Statement *definition );

src/ControlStruct/Mutate.cc

@@ -24 +24 @@
 #include "SynTree/Declaration.h"   // for Declaration
 #include "SynTree/Mutator.h"       // for mutateAll
-//#include "ExceptMutator.h"
 
 #include "Common/PassVisitor.h"    // for PassVisitor
@@ -37 +36 @@
 
                 // normalizes label definitions and generates multi-level exit labels
-                LabelFixer lfix;
-
-                //ExceptMutator exc;
+                PassVisitor<LabelFixer> lfix;
 
                 mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
-                //mutateAll( translationUnit, exc );
         }
 } // namespace CodeGen

src/InitTweak/InitTweak.cc

@@ -30 +30 @@
 namespace InitTweak {
         namespace {
-                class HasDesignations : public WithShortCircuiting {
-                public:
+                struct HasDesignations : public WithShortCircuiting {
                         bool hasDesignations = false;