Index: src/InitTweak/FixGlobalInit.cc =================================================================== --- src/InitTweak/FixGlobalInit.cc (revision 1ba5803c90674cf77489dd4409a2afd3b782551e) +++ src/InitTweak/FixGlobalInit.cc (revision c50d54d127a8d9ee804259333a744a4dcb787fac) @@ -29,5 +29,5 @@ #include "SynTree/Expression.h" // for ConstantExpr, Expression (ptr only) #include "SynTree/Initializer.h" // for ConstructorInit, Initializer -#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Label.h" // for Label #include "SynTree/Statement.h" // for CompoundStmt, Statement (ptr only) #include "SynTree/Type.h" // for Type, Type::StorageClasses, Functi... @@ -92,7 +92,7 @@ dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) ); } - initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) ); + initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() ); initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) ); - destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) ); + destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() ); destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) ); } Index: src/InitTweak/FixInit.cc =================================================================== --- src/InitTweak/FixInit.cc (revision 1ba5803c90674cf77489dd4409a2afd3b782551e) +++ src/InitTweak/FixInit.cc (revision c50d54d127a8d9ee804259333a744a4dcb787fac) @@ -49,5 +49,5 @@ #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... @@ -544,13 +544,13 @@ // 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 @@ -598,14 +598,14 @@ 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(); @@ -685,12 +685,12 @@ // 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 ); @@ -707,5 +707,5 @@ // 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 ); @@ -715,5 +715,5 @@ 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 Index: src/InitTweak/InitTweak.cc =================================================================== --- src/InitTweak/InitTweak.cc (revision 1ba5803c90674cf77489dd4409a2afd3b782551e) +++ src/InitTweak/InitTweak.cc (revision c50d54d127a8d9ee804259333a744a4dcb787fac) @@ -19,5 +19,5 @@ #include "SynTree/Expression.h" // for Expression, UntypedExpr, Applicati... #include "SynTree/Initializer.h" // for Initializer, ListInit, Designation -#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Label.h" // for Label #include "SynTree/Statement.h" // for CompoundStmt, ExprStmt, BranchStmt #include "SynTree/Type.h" // for FunctionType, ArrayType, PointerType @@ -195,9 +195,9 @@ callExpr->get_args().splice( callExpr->get_args().end(), args ); - *out++ = new IfStmt( noLabels, cond, new ExprStmt( noLabels, callExpr ), nullptr ); + *out++ = new IfStmt( cond, new ExprStmt( callExpr ), nullptr ); UntypedExpr * increment = new UntypedExpr( new NameExpr( "++?" ) ); increment->get_args().push_back( index->clone() ); - *out++ = new ExprStmt( noLabels, increment ); + *out++ = new ExprStmt( increment ); } @@ -244,10 +244,10 @@ std::list< Statement * > stmts; build( callExpr, idx, idxEnd, init, back_inserter( stmts ) ); - stmts.push_back( new BranchStmt( noLabels, switchLabel, BranchStmt::Break ) ); - CaseStmt * caseStmt = new CaseStmt( noLabels, condition, stmts ); + stmts.push_back( new BranchStmt( switchLabel, BranchStmt::Break ) ); + CaseStmt * caseStmt = new CaseStmt( condition, stmts ); branches.push_back( caseStmt ); } - *out++ = new SwitchStmt( noLabels, index->clone(), branches ); - *out++ = new NullStmt( std::list