Changeset 8a1289f for src/ResolvExpr

Timestamp:

May 30, 2018, 3:28:10 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

75308bcc

Parents:

80a7d48

Message:

Remove assorted expression clones from AlternativeFinder?

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (21 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -338 +338 @@
                         if ( ss >> val && ! (ss >> tmp) ) {
                                 if ( val >= 0 && (unsigned int)val < tupleType->size() ) {
-                                        alternatives.push_back( Alternative( new TupleIndexExpr( expr->clone(), val ), env, newCost ) );
+                                        alternatives.push_back( Alternative( new TupleIndexExpr( expr, val ), env, newCost ) );
                                 } // if
                         } // if
@@ -347 +347 @@
                                 int val;
                                 ss >> val;
-                                alternatives.push_back( Alternative( new TupleIndexExpr( expr->clone(), val ), env, newCost ) );
+                                alternatives.push_back( Alternative( new TupleIndexExpr( expr, val ), env, newCost ) );
                         }
                 } // if
@@ -353 +353 @@
 
         void AlternativeFinder::Finder::postvisit( ApplicationExpr *applicationExpr ) {
-                alternatives.push_back( Alternative( applicationExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( applicationExpr, env, Cost::zero ) );
         }
 
@@ -664 +664 @@
                         while ( pack->tupleStart == 0 ) {
                                 pack = &packs[pack->parent];
-                                exprs.push_front( pack->expr->clone() );
+                                exprs.push_front( pack->expr );
                                 cost += pack->cost;
                         }
@@ -749 +749 @@
                                                         newResult.cost = results[i].cost;
                                                         newResult.tupleStart = results[i].tupleStart;
-                                                        newResult.expr = results[i].expr->clone();
+                                                        newResult.expr = results[i].expr;
                                                         argType = newResult.expr->get_result();
 
@@ -1219 +1219 @@
                         if ( isLvalue( alt.expr ) ) {
                                 alternatives.push_back(
-                                        Alternative{ new AddressExpr( alt.expr->clone() ), alt.env, alt.cost } );
+                                        Alternative{ new AddressExpr( alt.expr ), alt.env, alt.cost } );
                         } // if
                 } // for
@@ -1225 +1225 @@
 
         void AlternativeFinder::Finder::postvisit( LabelAddressExpr * expr ) {
-                alternatives.push_back( Alternative{ expr->clone(), env, Cost::zero } );
+                alternatives.push_back( Alternative{ expr, env, Cost::zero } );
         }
 
@@ -1320 +1320 @@
                 for ( Alternative & alt : finder.alternatives ) {
                         alternatives.push_back( Alternative(
-                                new VirtualCastExpr( alt.expr->clone(), castExpr->get_result()->clone() ),
+                                new VirtualCastExpr( alt.expr, castExpr->get_result()->clone() ),
                                 alt.env, alt.cost ) );
                 }
@@ -1355 +1355 @@
 
         void AlternativeFinder::Finder::postvisit( MemberExpr *memberExpr ) {
-                alternatives.push_back( Alternative( memberExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( memberExpr, env, Cost::zero ) );
         }
 
@@ -1386 +1386 @@
 
         void AlternativeFinder::Finder::postvisit( ConstantExpr *constantExpr ) {
-                alternatives.push_back( Alternative( constantExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( constantExpr, env, Cost::zero ) );
         }
 
@@ -1406 +1406 @@
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr, choice.cost );
-                        alternatives.push_back( Alternative( new SizeofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
+                        alternatives.push_back( Alternative( new SizeofExpr( choice.expr ), choice.env, Cost::zero ) );
                 } // if
         }
@@ -1427 +1427 @@
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr, choice.cost );
-                        alternatives.push_back( Alternative( new AlignofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
+                        alternatives.push_back( Alternative( new AlignofExpr( choice.expr ), choice.env, Cost::zero ) );
                 } // if
         }
@@ -1456 +1456 @@
 
         void AlternativeFinder::Finder::postvisit( OffsetofExpr *offsetofExpr ) {
-                alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( offsetofExpr, env, Cost::zero ) );
         }
 
         void AlternativeFinder::Finder::postvisit( OffsetPackExpr *offsetPackExpr ) {
-                alternatives.push_back( Alternative( offsetPackExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( offsetPackExpr, env, Cost::zero ) );
         }
 
@@ -1538 +1538 @@
                                 compositeEnv.simpleCombine( second.env );
 
-                                LogicalExpr *newExpr = new LogicalExpr( first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() );
+                                LogicalExpr *newExpr = new LogicalExpr( first.expr, second.expr, logicalExpr->get_isAnd() );
                                 alternatives.push_back( Alternative( newExpr, compositeEnv, first.cost + second.cost ) );
                         }
@@ -1571 +1571 @@
                                         Type* commonType = nullptr;
                                         if ( unify( second.expr->result, third.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-                                                ConditionalExpr *newExpr = new ConditionalExpr( first.expr->clone(), second.expr->clone(), third.expr->clone() );
+                                                ConditionalExpr *newExpr = new ConditionalExpr( first.expr, second.expr, third.expr );
                                                 newExpr->result = commonType ? commonType : second.expr->result->clone();
                                                 // convert both options to the conditional result type
@@ -1590 +1590 @@
                 secondFinder.findWithAdjustment( commaExpr->get_arg2() );
                 for ( const Alternative & alt : secondFinder.alternatives ) {
-                        alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative( new CommaExpr( newFirstArg, alt.expr ), alt.env, alt.cost ) );
                 } // for
         }
@@ -1612 +1612 @@
                                 Type* commonType = nullptr;
                                 if ( unify( first.expr->result, second.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
-                                        RangeExpr * newExpr = new RangeExpr( first.expr->clone(), second.expr->clone() );
+                                        RangeExpr * newExpr = new RangeExpr( first.expr, second.expr );
                                         newExpr->result = commonType ? commonType : first.expr->result->clone();
                                         newAlt.expr = newExpr;
@@ -1640 +1640 @@
 
         void AlternativeFinder::Finder::postvisit( TupleExpr *tupleExpr ) {
-                alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( tupleExpr, env, Cost::zero ) );
         }
 
         void AlternativeFinder::Finder::postvisit( ImplicitCopyCtorExpr * impCpCtorExpr ) {
-                alternatives.push_back( Alternative( impCpCtorExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( impCpCtorExpr, env, Cost::zero ) );
         }
 
@@ -1653 +1653 @@
                 finder.findWithoutPrune( ctorExpr->get_callExpr() );
                 for ( Alternative & alt : finder.alternatives ) {
-                        alternatives.push_back( Alternative( new ConstructorExpr( alt.expr->clone() ), alt.env, alt.cost ) );
+                        alternatives.push_back( Alternative( new ConstructorExpr( alt.expr ), alt.env, alt.cost ) );
                 }
         }
 
         void AlternativeFinder::Finder::postvisit( TupleIndexExpr *tupleExpr ) {
-                alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( tupleExpr, env, Cost::zero ) );
         }
 
         void AlternativeFinder::Finder::postvisit( TupleAssignExpr *tupleAssignExpr ) {
-                alternatives.push_back( Alternative( tupleAssignExpr->clone(), env, Cost::zero ) );
+                alternatives.push_back( Alternative( tupleAssignExpr, env, Cost::zero ) );
         }
 
@@ -1670 +1670 @@
                 for ( Alternative & alt : finder.alternatives ) {
                         // ensure that the id is passed on to the UniqueExpr alternative so that the expressions are "linked"
-                        UniqueExpr * newUnqExpr = new UniqueExpr( alt.expr->clone(), unqExpr->get_id() );
+                        UniqueExpr * newUnqExpr = new UniqueExpr( alt.expr, unqExpr->get_id() );
                         alternatives.push_back( Alternative( newUnqExpr, alt.env, alt.cost ) );
                 }
@@ -1721 +1721 @@
                                         // count one safe conversion for each value that is thrown away
                                         thisCost.incSafe( discardedValues );
-                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr->clone(), toType, true ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
+                                        Alternative newAlt( new InitExpr( restructureCast( alt.expr, toType, true ), initAlt.designation ), newEnv, alt.cost, thisCost );
                                         inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( candidates ) );
                                 }