Changeset 692be4e for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Jan 29, 2019, 1:49:06 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

72514aa

Parents:

528ccc8 (diff), 8f99233 (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 'jenkins-sandbox' of plg.uwaterloo.ca:software/cfa/cfa-cc into jenkins-sandbox

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -474 +474 @@
                 }
 
-                // mark specialization cost of return types
-                for ( DeclarationWithType* returnVal : function->returnVals ) {
-                        convCost.decSpec( specCost( returnVal->get_type() ) );
-                }
+                // specialization cost of return types can't be accounted for directly, it disables 
+                // otherwise-identical calls, like this example based on auto-newline in the I/O lib:
+                //
+                //   forall(otype OS) {
+                //     void ?|?(OS&, int);  // with newline
+                //     OS&  ?|?(OS&, int);  // no newline, always chosen due to more specialization
+                //   }
 
                 // mark type variable and specialization cost of forall clause
@@ -483 +486 @@
                 for ( TypeDecl* td : function->forall ) {
                         convCost.decSpec( td->assertions.size() );
-                }
-
-                // xxx -- replace with new costs in resolver
-                for ( InferredParams::const_iterator assert = appExpr->inferParams.begin(); assert != appExpr->inferParams.end(); ++assert ) {
-                        convCost += computeConversionCost( assert->second.actualType, assert->second.formalType, indexer, alt.env );
                 }
 
@@ -1229 +1227 @@
                                 Alternative newAlt{ 
                                         restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), 
-                                        alt.env, openVars, needAssertions, alt.cost + thisCost, thisCost };
+                                        alt.env, openVars, needAssertions, alt.cost, alt.cost + thisCost };
                                 inferParameters( newAlt, back_inserter( candidates ) );
                         } // if