Changeset bc07190 for src/ResolvExpr/CastCost.cpp

Timestamp:

Jun 29, 2024, 7:33:28 AM (19 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

011c29e

Parents:

62a38e7 (diff), 115ac1ce (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

File:

• src/ResolvExpr/CastCost.cpp (modified) (4 diffs)

src/ResolvExpr/CastCost.cpp

@@ -53 +53 @@
                 void postvisit( const ast::EnumInstType * enumInst ) {
                         cost = conversionCost( enumInst, dst, srcIsLvalue, symtab, env );
+                        if ( enumInst->base->isTyped() ) {
+                                auto baseConversionCost = 
+                                        castCost( enumInst->base->base, dst, srcIsLvalue, symtab, env );
+                                cost = baseConversionCost < cost? baseConversionCost: cost;
+                        }
+                        static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
+                        Cost intCost = costCalc( integer, dst, srcIsLvalue, symtab, env );
+                        intCost.incSafe();
+                        cost = intCost < cost? intCost: cost;
                 }
 
@@ -63 +72 @@
                                 cost = conversionCost( basicType, dst, srcIsLvalue, symtab, env );
                                 if ( Cost::unsafe < cost ) {
-                                        if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                                // Always explict cast only for typed enum
-                                                if (enumInst->base->isTyped) cost = Cost::unsafe;
+                                        if ( dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                                cost = Cost::unsafe;
                                         }
                                 }
@@ -74 +82 @@
                         cost = conversionCost( zero, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
-                                if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
+                                if ( dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        cost = Cost::unsafe;
                                 }
                         }
@@ -83 +91 @@
                         cost = conversionCost( one, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
-                                if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
+                                if ( dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        cost = Cost::unsafe;
                                 }
                         }