Changeset 5c4a473 for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Aug 15, 2019, 10:31:53 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6daaee3

Parents:

d65f92c (diff), 3c7f01b (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 'master' into distcc

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:37:46 2019
-// Update Count     : 37
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug  8 16:35:00 2019
+// Update Count     : 38
 //
 
@@ -377 +377 @@
         }
 
-        Cost computeConversionCost( Type * actualType, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
+        Cost computeConversionCost( Type * actualType, Type * formalType, bool actualIsLvalue,
+                        const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
                 PRINT(
                         std::cerr << std::endl << "converting ";
@@ -387 +388 @@
                         std::cerr << std::endl;
                 )
-                Cost convCost = conversionCost( actualType, formalType, indexer, env );
+                Cost convCost = conversionCost( actualType, formalType, actualIsLvalue, indexer, env );
                 PRINT(
                         std::cerr << std::endl << "cost is " << convCost << std::endl;
@@ -402 +403 @@
 
         Cost computeExpressionConversionCost( Expression *& actualExpr, Type * formalType, const SymTab::Indexer &indexer, const TypeEnvironment & env ) {
-                Cost convCost = computeConversionCost( actualExpr->result, formalType, indexer, env );
+                Cost convCost = computeConversionCost(
+                        actualExpr->result, formalType, actualExpr->get_lvalue(), indexer, env );
 
                 // if there is a non-zero conversion cost, ignoring poly cost, then the expression requires conversion.
@@ -1186 +1188 @@
                 assert( toType );
                 toType = resolveTypeof( toType, indexer );
+                assert(!dynamic_cast<TypeofType *>(toType));
                 SymTab::validateType( toType, &indexer );
                 adjustExprType( toType, env, indexer );
@@ -1212 +1215 @@
                         unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
-                        Cost thisCost = castCost( alt.expr->result, castExpr->result, indexer,
-                                alt.env );
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, alt.expr->get_lvalue(),
+                                indexer, alt.env );
                         PRINT(
                                 std::cerr << "working on cast with result: " << castExpr->result << std::endl;
@@ -1640 +1643 @@
                                 // xxx - do some inspecting on this line... why isn't result bound to initAlt.type?
 
-                                Cost thisCost = castCost( alt.expr->result, toType, indexer, newEnv );
+                                Cost thisCost = castCost( alt.expr->result, toType, alt.expr->get_lvalue(),
+                                        indexer, newEnv );
                                 if ( thisCost != Cost::infinity ) {
                                         // count one safe conversion for each value that is thrown away