Index: src/GenPoly/Box.cc =================================================================== --- src/GenPoly/Box.cc (revision 4e7a4e6f5a54d4c358298acebe5d7a782f0fc9d5) +++ src/GenPoly/Box.cc (revision 0a6aad4aa53e854b5b0a43ec60d74add61bb90a4) @@ -49,5 +49,5 @@ #include "SynTree/Expression.h" // for ApplicationExpr, UntypedExpr #include "SynTree/Initializer.h" // for SingleInit, Initializer, Lis... -#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Label.h" // for Label #include "SynTree/Mutator.h" // for maybeMutate, Mutator, mutateAll #include "SynTree/Statement.h" // for ExprStmt, DeclStmt, ReturnStmt @@ -293,5 +293,5 @@ FunctionDecl *layoutDecl = new FunctionDecl( layoutofName( typeDecl ), functionNesting > 0 ? Type::StorageClasses() : Type::StorageClasses( Type::Static ), - LinkageSpec::AutoGen, layoutFnType, new CompoundStmt( noLabels ), + LinkageSpec::AutoGen, layoutFnType, new CompoundStmt(), std::list< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) ); layoutDecl->fixUniqueId(); @@ -321,5 +321,5 @@ /// makes an if-statement with a single-expression if-block and no then block Statement *makeCond( Expression *cond, Expression *ifPart ) { - return new IfStmt( noLabels, cond, new ExprStmt( noLabels, ifPart ), 0 ); + return new IfStmt( cond, new ExprStmt( ifPart ), 0 ); } @@ -340,5 +340,5 @@ /// adds an expression to a compound statement void addExpr( CompoundStmt *stmts, Expression *expr ) { - stmts->get_kids().push_back( new ExprStmt( noLabels, expr ) ); + stmts->get_kids().push_back( new ExprStmt( expr ) ); } @@ -629,5 +629,5 @@ ObjectDecl *Pass1::makeTemporary( Type *type ) { ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0, type, 0 ); - stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) ); + stmtsToAddBefore.push_back( new DeclStmt( newObj ) ); return newObj; } @@ -740,9 +740,9 @@ ObjectDecl *newObj = ObjectDecl::newObject( tempNamer.newName(), newType, nullptr ); newObj->get_type()->get_qualifiers() = Type::Qualifiers(); // TODO: is this right??? - stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) ); + stmtsToAddBefore.push_back( new DeclStmt( newObj ) ); UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) ); // TODO: why doesn't this just use initialization syntax? assign->get_args().push_back( new VariableExpr( newObj ) ); assign->get_args().push_back( arg ); - stmtsToAddBefore.push_back( new ExprStmt( noLabels, assign ) ); + stmtsToAddBefore.push_back( new ExprStmt( assign ) ); arg = new AddressExpr( new VariableExpr( newObj ) ); } // if @@ -888,5 +888,5 @@ // void return addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars ); - bodyStmt = new ExprStmt( noLabels, adapteeApp ); + bodyStmt = new ExprStmt( adapteeApp ); } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { // return type T @@ -900,11 +900,11 @@ addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars ); assign->get_args().push_back( adapteeApp ); - bodyStmt = new ExprStmt( noLabels, assign ); + bodyStmt = new ExprStmt( assign ); } else { // adapter for a function that returns a monomorphic value addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars ); - bodyStmt = new ReturnStmt( noLabels, adapteeApp ); + bodyStmt = new ReturnStmt( adapteeApp ); } // if - CompoundStmt *adapterBody = new CompoundStmt( noLabels ); + CompoundStmt *adapterBody = new CompoundStmt(); adapterBody->get_kids().push_back( bodyStmt ); std::string adapterName = makeAdapterName( mangleName ); @@ -952,5 +952,5 @@ std::pair< AdapterIter, bool > answer = adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, newAdapter ) ); adapter = answer.first; - stmtsToAddBefore.push_back( new DeclStmt( noLabels, newAdapter ) ); + stmtsToAddBefore.push_back( new DeclStmt( newAdapter ) ); } // if assert( adapter != adapters.end() ); @@ -1279,5 +1279,5 @@ retval->set_name( "_retval" ); } - functionDecl->get_statements()->get_kids().push_front( new DeclStmt( noLabels, retval ) ); + functionDecl->get_statements()->get_kids().push_front( new DeclStmt( retval ) ); DeclarationWithType * newRet = retval->clone(); // for ownership purposes ftype->get_returnVals().front() = newRet; @@ -1519,5 +1519,5 @@ // (alloca was previously used, but can't be safely used in loops) ObjectDecl *newBuf = ObjectDecl::newObject( bufNamer.newName(), polyToMonoType( objectDecl->type ), nullptr ); - stmtsToAddBefore.push_back( new DeclStmt( noLabels, newBuf ) ); + stmtsToAddBefore.push_back( new DeclStmt( newBuf ) ); delete objectDecl->get_init(); @@ -1598,5 +1598,5 @@ ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) { ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, 0, type, init ); - stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) ); + stmtsToAddBefore.push_back( new DeclStmt( newObj ) ); return newObj; } @@ -1677,5 +1677,5 @@ addOtypeParamsToLayoutCall( layoutCall, otypeParams ); - stmtsToAddBefore.push_back( new ExprStmt( noLabels, layoutCall ) ); + stmtsToAddBefore.push_back( new ExprStmt( layoutCall ) ); } @@ -1703,5 +1703,5 @@ addOtypeParamsToLayoutCall( layoutCall, otypeParams ); - stmtsToAddBefore.push_back( new ExprStmt( noLabels, layoutCall ) ); + stmtsToAddBefore.push_back( new ExprStmt( layoutCall ) ); return true; Index: src/GenPoly/InstantiateGeneric.cc =================================================================== --- src/GenPoly/InstantiateGeneric.cc (revision 4e7a4e6f5a54d4c358298acebe5d7a782f0fc9d5) +++ src/GenPoly/InstantiateGeneric.cc (revision 0a6aad4aa53e854b5b0a43ec60d74add61bb90a4) @@ -526,5 +526,5 @@ Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ) ); ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), new ReferenceType( Type::Qualifiers(), concType ), new SingleInit( init ) ); - stmtsToAddBefore.push_back( new DeclStmt( noLabels, tmp ) ); + stmtsToAddBefore.push_back( new DeclStmt( tmp ) ); return new VariableExpr( tmp ); } else { Index: src/GenPoly/Specialize.cc =================================================================== --- src/GenPoly/Specialize.cc (revision 4e7a4e6f5a54d4c358298acebe5d7a782f0fc9d5) +++ src/GenPoly/Specialize.cc (revision 0a6aad4aa53e854b5b0a43ec60d74add61bb90a4) @@ -35,5 +35,5 @@ #include "SynTree/Declaration.h" // for FunctionDecl, DeclarationWit... #include "SynTree/Expression.h" // for ApplicationExpr, Expression -#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, DeclStmt, Expr... @@ -234,5 +234,5 @@ } // if // create new thunk with same signature as formal type (C linkage, empty body) - FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), Type::StorageClasses(), LinkageSpec::C, newType, new CompoundStmt( noLabels ) ); + FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), Type::StorageClasses(), LinkageSpec::C, newType, new CompoundStmt() ); thunkFunc->fixUniqueId(); @@ -287,12 +287,12 @@ Statement *appStmt; if ( funType->returnVals.empty() ) { - appStmt = new ExprStmt( noLabels, appExpr ); - } else { - appStmt = new ReturnStmt( noLabels, appExpr ); + appStmt = new ExprStmt( appExpr ); + } else { + appStmt = new ReturnStmt( appExpr ); } // if thunkFunc->statements->kids.push_back( appStmt ); // add thunk definition to queue of statements to add - stmtsToAddBefore.push_back( new DeclStmt( noLabels, thunkFunc ) ); + stmtsToAddBefore.push_back( new DeclStmt( thunkFunc ) ); // return address of thunk function as replacement expression return new AddressExpr( new VariableExpr( thunkFunc ) );