Changeset 63be3387 for src/ResolvExpr

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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:

• CommonType.cc (modified) (2 diffs)
• ConversionCost.cc (modified) (1 diff)
• SatisfyAssertions.cpp (modified) (1 diff)

src/ResolvExpr/CommonType.cc

@@ -991 +991 @@
                                 add_qualifiers( result, type2->qualifiers );
                         } else {
-                                // xxx - does unifying a ref with typed enumInst makes sense?
                                 if (!dynamic_cast<const ast::EnumInstType *>(type2))
                                         result = commonType( type2, ref, tenv, need, have, open, widen, symtab );
@@ -1010 +1009 @@
 
                 void postvisit( const ast::EnumInstType * enumInst ) {
-                        // reuse BasicType/EnumInstType common type by swapping
-                        // xxx - is this already handled by unify?
                         if (!dynamic_cast<const ast::EnumInstType *>(type2))
                                 result = commonType( type2, enumInst, tenv, need, have, open, widen, symtab);

src/ResolvExpr/ConversionCost.cc

@@ -720 +720 @@
                 costCalc( baseType, dst, srcIsLvalue, symtab, env );
         } else {
-                (void)enumInstType;
                 static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicType::SignedInt ) };
                 cost = costCalc( integer, dst, srcIsLvalue, symtab, env );

src/ResolvExpr/SatisfyAssertions.cpp

@@ -268 +268 @@
                 ast::ptr< ast::Type > resType = cand.expr->result;
                 cand.env.apply( resType );
-                return Mangle::mangle( resType, Mangle::typeMode() );
+                return Mangle::mangleType( resType );
         }