Changeset 86ad276 for src/ControlStruct

Timestamp:

Dec 5, 2017, 1:36:23 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:

12d2dc8

Parents:

f3b9efc (diff), 5da9d6a (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

Location:

src/ControlStruct

Files:

• ExceptTranslate.cc (modified) (23 diffs)
• ForExprMutator.cc (modified) (1 diff)
• LabelFixer.cc (modified) (3 diffs)
• LabelFixer.h (modified) (3 diffs)
• MLEMutator.cc (modified) (3 diffs)
• Mutate.cc (modified) (2 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -30 +30 @@
 #include "SynTree/Expression.h"       // for UntypedExpr, ConstantExpr, Name...
 #include "SynTree/Initializer.h"      // for SingleInit, ListInit
-#include "SynTree/Label.h"            // for Label, noLabels
+#include "SynTree/Label.h"            // for Label
 #include "SynTree/Mutator.h"          // for mutateAll
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
@@ -57 +57 @@
 
         void appendDeclStmt( CompoundStmt * block, Declaration * item ) {
-                block->push_back(new DeclStmt(noLabels, item));
+                block->push_back(new DeclStmt(item));
         }
 
@@ -205 +205 @@
                 throwStmt->set_expr( nullptr );
                 delete throwStmt;
-                return new ExprStmt( noLabels, call );
+                return new ExprStmt( call );
         }
 
@@ -220 +220 @@
                 assert( handler_except_decl );
 
-                CompoundStmt * result = new CompoundStmt( throwStmt->get_labels() );
-                result->push_back( new ExprStmt( noLabels, UntypedExpr::createAssign(
+                CompoundStmt * result = new CompoundStmt();
+                result->labels =  throwStmt->labels;
+                result->push_back( new ExprStmt( UntypedExpr::createAssign(
                         nameOf( handler_except_decl ),
                         new ConstantExpr( Constant::null(
@@ -231 +232 @@
                         ) ) );
                 result->push_back( new ExprStmt(
-                        noLabels,
                         new UntypedExpr( new NameExpr( "__cfaabi_ehm__rethrow_terminate" ) )
                         ) );
@@ -248 +248 @@
                 // return false;
                 Statement * result = new ReturnStmt(
-                        throwStmt->get_labels(),
                         new ConstantExpr( Constant::from_bool( false ) )
                         );
+                result->labels = throwStmt->labels;
                 delete throwStmt;
                 return result;
@@ -291 +291 @@
                         // }
                         // return;
-                        CompoundStmt * block = new CompoundStmt( noLabels );
+                        CompoundStmt * block = new CompoundStmt();
 
                         // Just copy the exception value. (Post Validation)
@@ -304 +304 @@
                                         ) })
                                 );
-                        block->push_back( new DeclStmt( noLabels, local_except ) );
+                        block->push_back( new DeclStmt( local_except ) );
 
                         // Add the cleanup attribute.
@@ -324 +324 @@
 
                         std::list<Statement *> caseBody
-                                        { block, new ReturnStmt( noLabels, nullptr ) };
+                                        { block, new ReturnStmt( nullptr ) };
                         handler_wrappers.push_back( new CaseStmt(
-                                noLabels,
                                 new ConstantExpr( Constant::from_int( index ) ),
                                 caseBody
@@ -340 +339 @@
 
                 SwitchStmt * handler_lookup = new SwitchStmt(
-                        noLabels,
                         nameOf( index_obj ),
                         stmt_handlers
                         );
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
                 body->push_back( handler_lookup );
 
@@ -363 +361 @@
                 // }
 
-                CompoundStmt * block = new CompoundStmt( noLabels );
+                CompoundStmt * block = new CompoundStmt();
 
                 // Local Declaration
@@ -369 +367 @@
                         dynamic_cast<ObjectDecl *>( modded_handler->get_decl() );
                 assert( local_except );
-                block->push_back( new DeclStmt( noLabels, local_except ) );
+                block->push_back( new DeclStmt( local_except ) );
 
                 // Check for type match.
@@ -381 +379 @@
                 }
                 // Construct the match condition.
-                block->push_back( new IfStmt( noLabels,
+                block->push_back( new IfStmt(
                         cond, modded_handler->get_body(), nullptr ) );
 
@@ -397 +395 @@
                 // }
 
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
 
                 FunctionType * func_type = match_func_t.clone();
@@ -413 +411 @@
 
                         // Create new body.
-                        handler->set_body( new ReturnStmt( noLabels,
+                        handler->set_body( new ReturnStmt(
                                 new ConstantExpr( Constant::from_int( index ) ) ) );
 
@@ -421 +419 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels,
+                body->push_back( new ReturnStmt(
                         new ConstantExpr( Constant::from_int( 0 ) ) ) );
 
@@ -441 +439 @@
                 args.push_back( nameOf( terminate_match ) );
 
-                CompoundStmt * callStmt = new CompoundStmt( noLabels );
-                callStmt->push_back( new ExprStmt( noLabels, caller ) );
+                CompoundStmt * callStmt = new CompoundStmt();
+                callStmt->push_back( new ExprStmt( caller ) );
                 return callStmt;
         }
@@ -451 +449 @@
                 //     HANDLER WRAPPERS { `hander->body`; return true; }
                 // }
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
 
                 FunctionType * func_type = handle_func_t.clone();
@@ -464 +462 @@
                                 dynamic_cast<CompoundStmt*>( handler->get_body() );
                         if ( ! handling_code ) {
-                                handling_code = new CompoundStmt( noLabels );
+                                handling_code = new CompoundStmt();
                                 handling_code->push_back( handler->get_body() );
                         }
-                        handling_code->push_back( new ReturnStmt( noLabels,
+                        handling_code->push_back( new ReturnStmt(
                                 new ConstantExpr( Constant::from_bool( true ) ) ) );
                         handler->set_body( handling_code );
@@ -476 +474 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels,
+                body->push_back( new ReturnStmt(
                         new ConstantExpr( Constant::from_bool( false ) ) ) );
 
@@ -486 +484 @@
                         Statement * wraps,
                         FunctionDecl * resume_handler ) {
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
 
                 // struct __try_resume_node __resume_node
@@ -521 +519 @@
                 setup->get_args().push_back( nameOf( resume_handler ) );
 
-                body->push_back( new ExprStmt( noLabels, setup ) );
+                body->push_back( new ExprStmt( setup ) );
 
                 body->push_back( wraps );
@@ -646 +644 @@
                 // Generate a prefix for the function names?
 
-                CompoundStmt * block = new CompoundStmt( noLabels );
+                CompoundStmt * block = new CompoundStmt();
                 CompoundStmt * inner = take_try_block( tryStmt );
 

src/ControlStruct/ForExprMutator.cc

@@ -29 +29 @@
                 // Create compound statement, move initializers outside,
                 // the resut of the original stays as is.
-                CompoundStmt *block = new CompoundStmt( std::list< Label >() );
+                CompoundStmt *block = new CompoundStmt();
                 std::list<Statement *> &stmts = block->get_kids();
                 stmts.splice( stmts.end(), init );

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/MLEMutator.cc

@@ -149 +149 @@
 
                         if ( CaseStmt * c = dynamic_cast< CaseStmt * >( statements.back() ) ) {
-                                std::list<Label> temp; temp.push_back( brkLabel );
-                                c->get_statements().push_back( new BranchStmt( temp, Label("brkLabel"), BranchStmt::Break ) );
+                                Statement * stmt = new BranchStmt( Label("brkLabel"), BranchStmt::Break );
+                                stmt->labels.push_back( brkLabel );
+                                c->get_statements().push_back( stmt );
                         } else assert(0); // as of this point, all statements of a switch are still CaseStmts
                 } // if
@@ -232 +233 @@
                 // transform break/continue statements into goto to simplify later handling of branches
                 delete branchStmt;
-                return new BranchStmt( std::list<Label>(), exitLabel, BranchStmt::Goto );
+                return new BranchStmt( exitLabel, BranchStmt::Goto );
         }
 
@@ -239 +240 @@
                 CompoundStmt *newBody;
                 if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
-                        newBody = new CompoundStmt( std::list< Label >() );
+                        newBody = new CompoundStmt();
                         newBody->get_kids().push_back( bodyLoop );
                 } // if

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