Index: src/ResolvExpr/AdjustExprType.cc =================================================================== --- src/ResolvExpr/AdjustExprType.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/AdjustExprType.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -66,12 +66,9 @@ Type * AdjustExprType::postmutate( ArrayType * arrayType ) { - PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base ); - arrayType->base = nullptr; - delete arrayType; - return pointerType; + return new PointerType{ arrayType->get_qualifiers(), arrayType->base }; } Type * AdjustExprType::postmutate( FunctionType * functionType ) { - return new PointerType( Type::Qualifiers(), functionType ); + return new PointerType{ Type::Qualifiers(), functionType }; } @@ -80,12 +77,10 @@ if ( env.lookup( typeInst->get_name(), eqvClass ) ) { if ( eqvClass.data.kind == TypeDecl::Ftype ) { - PointerType *pointerType = new PointerType( Type::Qualifiers(), typeInst ); - return pointerType; + return new PointerType{ Type::Qualifiers(), typeInst }; } } else if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) { if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) { if ( tyDecl->get_kind() == TypeDecl::Ftype ) { - PointerType *pointerType = new PointerType( Type::Qualifiers(), typeInst ); - return pointerType; + return new PointerType{ Type::Qualifiers(), typeInst }; } // if } // if Index: src/ResolvExpr/Alternative.cc =================================================================== --- src/ResolvExpr/Alternative.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/Alternative.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -34,36 +34,4 @@ Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost, const Cost &cvtCost ) : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {} - - Alternative::Alternative( const Alternative &other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( maybeClone( other.expr ) ), env( other.env ) { - } - - Alternative &Alternative::operator=( const Alternative &other ) { - if ( &other == this ) return *this; - delete expr; - cost = other.cost; - cvtCost = other.cvtCost; - expr = maybeClone( other.expr ); - env = other.env; - return *this; - } - - Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) { - other.expr = nullptr; - } - - Alternative & Alternative::operator=( Alternative && other ) { - if ( &other == this ) return *this; - delete expr; - cost = other.cost; - cvtCost = other.cvtCost; - expr = other.expr; - env = other.env; - other.expr = nullptr; - return *this; - } - - Alternative::~Alternative() { - delete expr; - } void Alternative::print( std::ostream &os, Indenter indent ) const { Index: src/ResolvExpr/Alternative.h =================================================================== --- src/ResolvExpr/Alternative.h (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/Alternative.h (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -29,22 +29,12 @@ Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost ); Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost, const Cost &cvtCost ); - Alternative( const Alternative &other ); - Alternative &operator=( const Alternative &other ); - Alternative( Alternative && other ); - Alternative &operator=( Alternative && other ); - ~Alternative(); + Alternative( const Alternative &other ) = default; + Alternative &operator=( const Alternative &other ) = default; void print( std::ostream &os, Indenter indent = {} ) const; - /// Returns the stored expression, but released from management of this Alternative - Expression* release_expr() { - Expression* tmp = expr; - expr = nullptr; - return tmp; - } - Cost cost; Cost cvtCost; - Expression *expr; + Expression * expr; TypeEnvironment env; }; Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/AlternativeFinder.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -165,5 +165,4 @@ candidate->env.apply( newType ); mangleName = SymTab::Mangler::mangle( newType ); - delete newType; } std::map< std::string, PruneStruct >::iterator mapPlace = selected.find( mangleName ); @@ -568,5 +567,4 @@ Expression *varExpr = data.combine( newerAlt.cvtCost ); - delete varExpr->get_result(); varExpr->set_result( adjType->clone() ); PRINT( @@ -585,6 +583,4 @@ (*inferParameters)[ curDecl->get_uniqueId() ] = ParamEntry( candidate->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr ); inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, /*newNeedParents,*/ level, indexer, out ); - } else { - delete adjType; } } @@ -1264,5 +1260,4 @@ componentExprs.push_back( restructureCast( idx, toType->getComponent( i ) ) ); } - delete argExpr; assert( componentExprs.size() > 0 ); // produce the tuple of casts @@ -1600,5 +1595,4 @@ alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) ); } // for - delete newFirstArg; } Index: src/ResolvExpr/ResolveTypeof.cc =================================================================== --- src/ResolvExpr/ResolveTypeof.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/ResolveTypeof.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -70,9 +70,5 @@ Expression * newExpr = resolveInVoidContext( typeofType->expr, indexer ); assert( newExpr->result && ! newExpr->result->isVoid() ); - Type * newType = newExpr->result; - newExpr->result = nullptr; - delete typeofType; - delete newExpr; - return newType; + return newExpr->result; } // if return typeofType; Index: src/ResolvExpr/Resolver.cc =================================================================== --- src/ResolvExpr/Resolver.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/Resolver.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -138,5 +138,4 @@ castExpr->arg = nullptr; std::swap( expr->env, castExpr->env ); - delete castExpr; } } @@ -198,5 +197,4 @@ findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, adjust, prune, failFast ); finishExpr( choice.expr, choice.env, untyped->env ); - delete untyped; untyped = choice.expr; choice.expr = nullptr; @@ -244,5 +242,4 @@ Expression * newExpr = resolveInVoidContext( untyped, indexer, env ); finishExpr( newExpr, env, untyped->env ); - delete untyped; untyped = newExpr; } @@ -418,5 +415,4 @@ caseStmt->condition = castExpr->arg; castExpr->arg = nullptr; - delete castExpr; } } @@ -700,5 +696,4 @@ std::swap( initExpr->env, newExpr->env ); std::swap( initExpr->inferParams, newExpr->inferParams ) ; - delete initExpr; // get the actual object's type (may not exactly match what comes back from the resolver due to conversions) @@ -718,5 +713,4 @@ ce->set_arg( nullptr ); std::swap( ce->env, newExpr->env ); - delete ce; } } @@ -769,8 +763,6 @@ // could not find valid constructor, or found an intrinsic constructor // fall back on C-style initializer - delete ctorInit->get_ctor(); - ctorInit->set_ctor( NULL ); - delete ctorInit->get_dtor(); - ctorInit->set_dtor( NULL ); + ctorInit->set_ctor( nullptr ); + ctorInit->set_dtor( nullptr ); maybeAccept( ctorInit->get_init(), *visitor ); } @@ -798,5 +790,4 @@ // found a constructor - can get rid of C-style initializer - delete ctorInit->init; ctorInit->init = nullptr; @@ -805,10 +796,8 @@ // to clean up generated code. if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) { - delete ctorInit->ctor; ctorInit->ctor = nullptr; } if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) { - delete ctorInit->dtor; ctorInit->dtor = nullptr; } Index: src/ResolvExpr/TypeEnvironment.cc =================================================================== --- src/ResolvExpr/TypeEnvironment.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/TypeEnvironment.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -59,11 +59,6 @@ EqvClass &EqvClass::operator=( const EqvClass &other ) { if ( this == &other ) return *this; - delete type; initialize( other, *this ); return *this; - } - - EqvClass::~EqvClass() { - delete type; } @@ -147,5 +142,4 @@ /// std::cerr << " bound to variable " << *theClass->vars.begin() << std::endl; sub.add( *theVar, newTypeInst ); - delete newTypeInst; } // if } // for @@ -188,7 +182,5 @@ if ( secondClass->type ) { if ( newClass.type ) { - Type *newType = combineFunc( newClass.type, secondClass->type ); - delete newClass.type; - newClass.type = newType; + newClass.type = combineFunc( newClass.type, secondClass->type ); newClass.allowWidening = newClass.allowWidening && secondClass->allowWidening; } else { Index: src/ResolvExpr/TypeEnvironment.h =================================================================== --- src/ResolvExpr/TypeEnvironment.h (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/TypeEnvironment.h (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -67,5 +67,4 @@ EqvClass( const EqvClass &other ); EqvClass &operator=( const EqvClass &other ); - ~EqvClass(); void print( std::ostream &os, Indenter indent = {} ) const; }; Index: src/ResolvExpr/Unify.cc =================================================================== --- src/ResolvExpr/Unify.cc (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/Unify.cc (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -99,8 +99,5 @@ findOpenVars( newSecond, openVars, closedVars, needAssertions, haveAssertions, true ); - bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ); - delete newFirst; - delete newSecond; - return result; + return unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ); } @@ -123,8 +120,5 @@ /// newSecond->print( std::cerr ); /// std::cerr << std::endl; - bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ); - delete newFirst; - delete newSecond; - return result; + return unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ); } @@ -176,5 +170,4 @@ if ( common ) { common->get_qualifiers() = Type::Qualifiers(); - delete curClass.type; curClass.type = common; env.add( curClass ); @@ -239,5 +232,4 @@ if ( common ) { common->get_qualifiers() = Type::Qualifiers(); - delete class1.type; class1.type = common; } // if @@ -272,6 +264,4 @@ env.add( newClass ); } // if - delete type1; - delete type2; return result; } @@ -282,12 +272,5 @@ findOpenVars( type2, openVars, closedVars, needAssertions, haveAssertions, true ); Type *commonType = 0; - if ( unifyInexact( type1, type2, env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ) ) { - if ( commonType ) { - delete commonType; - } // if - return true; - } else { - return false; - } // if + return unifyInexact( type1, type2, env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ); } @@ -544,5 +527,4 @@ // expand ttype parameter into its actual type if ( eqvClass.type ) { - delete typeInst; return eqvClass.type->clone(); } @@ -569,5 +551,4 @@ dst.push_back( new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::C, nullptr, t, nullptr ) ); } - delete dcl; } } Index: src/ResolvExpr/Unify.h =================================================================== --- src/ResolvExpr/Unify.h (revision 09c72d5b6600e44f191c62a215942254161db898) +++ src/ResolvExpr/Unify.h (revision 68f9c43ecf1873cbb5f06aee682704b56612ed16) @@ -64,10 +64,5 @@ bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer ) { std::list< Type* > commonTypes; - if ( unifyList( list1Begin, list1End, list2Begin, list2End, env, needAssertions, haveAssertions, openVars, indexer, commonTypes ) ) { - deleteAll( commonTypes ); - return true; - } else { - return false; - } // if + return unifyList( list1Begin, list1End, list2Begin, list2End, env, needAssertions, haveAssertions, openVars, indexer, commonTypes ); }