Changeset c13e8dc8 for src/InitTweak/FixInit.cc

Timestamp:

Dec 5, 2017, 2:35:03 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (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' into cleanup-dtors

File:

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

src/InitTweak/FixInit.cc

@@ -49 +49 @@
 #include "SynTree/Expression.h"        // for UniqueExpr, VariableExpr, Unty...
 #include "SynTree/Initializer.h"       // for ConstructorInit, SingleInit
-#include "SynTree/Label.h"             // for Label, noLabels, operator<
+#include "SynTree/Label.h"             // for Label, operator<
 #include "SynTree/Mutator.h"           // for mutateAll, Mutator, maybeMutate
 #include "SynTree/Statement.h"         // for ExprStmt, CompoundStmt, Branch...
@@ -547 +547 @@
                         // add all temporary declarations and their constructors
                         for ( ObjectDecl * obj : tempDecls ) {
-                                stmtsToAddBefore.push_back( new DeclStmt( noLabels, obj ) );
+                                stmtsToAddBefore.push_back( new DeclStmt( obj ) );
                         } // for
                         for ( ObjectDecl * obj : returnDecls ) {
-                                stmtsToAddBefore.push_back( new DeclStmt( noLabels, obj ) );
+                                stmtsToAddBefore.push_back( new DeclStmt( obj ) );
                         } // for
 
                         // add destructors after current statement
                         for ( Expression * dtor : dtors ) {
-                                stmtsToAddAfter.push_back( new ExprStmt( noLabels, dtor ) );
+                                stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
                         } // for
 
@@ -601 +601 @@
                         if ( ! result->isVoid() ) {
                                 for ( ObjectDecl * obj : stmtExpr->get_returnDecls() ) {
-                                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, obj ) );
+                                        stmtsToAddBefore.push_back( new DeclStmt( obj ) );
                                 } // for
                                 // add destructors after current statement
                                 for ( Expression * dtor : stmtExpr->get_dtors() ) {
-                                        stmtsToAddAfter.push_back( new ExprStmt( noLabels, dtor ) );
+                                        stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
                                 } // for
                                 // must have a non-empty body, otherwise it wouldn't have a result
                                 assert( ! stmts.empty() );
                                 assert( ! stmtExpr->get_returnDecls().empty() );
-                                stmts.push_back( new ExprStmt( noLabels, new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
+                                stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
                                 stmtExpr->get_returnDecls().clear();
                                 stmtExpr->get_dtors().clear();
@@ -739 +739 @@
 
                                                 // generate body of if
-                                                CompoundStmt * initStmts = new CompoundStmt( noLabels );
+                                                CompoundStmt * initStmts = new CompoundStmt();
                                                 std::list< Statement * > & body = initStmts->get_kids();
                                                 body.push_back( ctor );
-                                                body.push_back( new ExprStmt( noLabels, setTrue ) );
+                                                body.push_back( new ExprStmt( setTrue ) );
 
                                                 // put it all together
-                                                IfStmt * ifStmt = new IfStmt( noLabels, new VariableExpr( isUninitializedVar ), initStmts, 0 );
-                                                stmtsToAddAfter.push_back( new DeclStmt( noLabels, isUninitializedVar ) );
+                                                IfStmt * ifStmt = new IfStmt( new VariableExpr( isUninitializedVar ), initStmts, 0 );
+                                                stmtsToAddAfter.push_back( new DeclStmt( isUninitializedVar ) );
                                                 stmtsToAddAfter.push_back( ifStmt );
 
@@ -761 +761 @@
 
                                                         // void __objName_dtor_atexitN(...) {...}
-                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                                                         dtorCaller->fixUniqueId();
                                                         dtorCaller->get_statements()->push_back( dtorStmt );
@@ -769 +769 @@
                                                         callAtexit->get_args().push_back( new VariableExpr( dtorCaller ) );
 
-                                                        body.push_back( new ExprStmt( noLabels, callAtexit ) );
+                                                        body.push_back( new ExprStmt( callAtexit ) );
 
                                                         // hoist variable and dtor caller decls to list of decls that will be added into global scope