Changeset 3d618a0 for src/ResolvExpr

Timestamp:

Sep 9, 2024, 6:16:09 PM (13 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

aa14aafe

Parents:

d93b813 (diff), f5dbc8d (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (4 diffs)
• ConversionCost.cpp (modified) (2 diffs)
• Unify.cpp (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -10 +10 @@
 // Created On       : Wed Jun 5 14:30:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 22 08:07:26 2024
-// Update Count     : 4
+// Last Modified On : Mon Sep  9 11:30:11 2024
+// Update Count     : 5
 //
 
@@ -1239 +1239 @@
                 CandidateList matches;
                 Cost minExprCost = Cost::infinity;
-                Cost minCastCost = Cost::infinity;
+                // Cost minCastCost = Cost::infinity;
                 for ( CandidateRef & cand : finder.candidates ) {
                         ast::ptr< ast::Type > fromType = cand->expr->result;
@@ -1482 +1482 @@
 
         void Finder::postvisit( const ast::SizeofExpr * sizeofExpr ) {
-                if ( sizeofExpr->type ) {
-                        addCandidate(
-                                new ast::SizeofExpr{
-                                        sizeofExpr->location, resolveTypeof( sizeofExpr->type, context ) },
-                                tenv );
-                } else {
-                        // find all candidates for the argument to sizeof
-                        CandidateFinder finder( context, tenv );
-                        finder.find( sizeofExpr->expr );
-                        // find the lowest-cost candidate, otherwise ambiguous
-                        CandidateList winners = findMinCost( finder.candidates );
-                        if ( winners.size() != 1 ) {
-                                SemanticError(
-                                        sizeofExpr->expr.get(), "Ambiguous expression in sizeof operand: " );
-                        }
-                        // return the lowest-cost candidate
-                        CandidateRef & choice = winners.front();
-                        choice->expr = referenceToRvalueConversion( choice->expr, choice->cost );
-                        choice->cost = Cost::zero;
-                        addCandidate( *choice, new ast::SizeofExpr{ sizeofExpr->location, choice->expr } );
-                }
+                addCandidate(
+                        new ast::SizeofExpr{
+                                sizeofExpr->location, resolveTypeof( sizeofExpr->type, context ) },
+                        tenv );
         }
 
@@ -1537 +1520 @@
 
         void Finder::postvisit( const ast::AlignofExpr * alignofExpr ) {
-                if ( alignofExpr->type ) {
-                        addCandidate(
-                                new ast::AlignofExpr{
-                                        alignofExpr->location, resolveTypeof( alignofExpr->type, context ) },
-                                tenv );
-                } else {
-                        // find all candidates for the argument to alignof
-                        CandidateFinder finder( context, tenv );
-                        finder.find( alignofExpr->expr );
-                        // find the lowest-cost candidate, otherwise ambiguous
-                        CandidateList winners = findMinCost( finder.candidates );
-                        if ( winners.size() != 1 ) {
-                                SemanticError(
-                                        alignofExpr->expr.get(), "Ambiguous expression in alignof operand: " );
-                        }
-                        // return the lowest-cost candidate
-                        CandidateRef & choice = winners.front();
-                        choice->expr = referenceToRvalueConversion( choice->expr, choice->cost );
-                        choice->cost = Cost::zero;
-                        addCandidate(
-                                *choice, new ast::AlignofExpr{ alignofExpr->location, choice->expr } );
-                }
+                addCandidate(
+                        new ast::AlignofExpr{
+                                alignofExpr->location, resolveTypeof( alignofExpr->type, context ) },
+                        tenv );
         }
 

src/ResolvExpr/ConversionCost.cpp

@@ -192 +192 @@
 
 Cost enumCastCost (
-        const ast::EnumInstType * src, const ast::EnumInstType * dst, 
+        const ast::EnumInstType * src, const ast::EnumInstType * dst,
         const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
 );
@@ -488 +488 @@
 // (dst) src is safe is src is a subtype of dst, or dst {inline src, ...}
 Cost enumCastCost (
-        const ast::EnumInstType * src, const ast::EnumInstType * dst, 
+        const ast::EnumInstType * src, const ast::EnumInstType * dst,
         const ast::SymbolTable & symtab, const ast::TypeEnvironment & env
 ) {

src/ResolvExpr/Unify.cpp

@@ -234 +234 @@
                         if ( !e2so ) return;
 
-                        assert((e1->type != nullptr) ^ (e1->expr != nullptr));
-                        assert((e2so->type != nullptr) ^ (e2so->expr != nullptr));
-                        if ( !(e1->type && e2so->type) ) return;
-
                         // expression unification calls type unification (mutual recursion)
                         result = unifyExact( e1->type, e2so->type, tenv, need, have, open, widen );