Changeset bf4fe05 for src/ResolvExpr/CastCost.cpp

Timestamp:

May 13, 2024, 7:07:06 AM (17 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca4f2b2

Parents:

ec20ab9 (diff), 5f225f5 (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:

fix merge

File:

• src/ResolvExpr/CastCost.cpp (moved) (moved from src/ResolvExpr/CastCost.cc ) (4 diffs)

src/ResolvExpr/CastCost.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CastCost.cc --
+// CastCost.cpp --
 //
 // Author           : Richard C. Bilson
@@ -22 +22 @@
 #include "AST/Type.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "ConversionCost.h"              // for ConversionCost
-#include "Cost.h"                        // for Cost, Cost::infinity
-#include "ResolvExpr/ConversionCost.h"   // for conversionCost
+#include "ConversionCost.hpp"            // for ConversionCost
+#include "Cost.hpp"                      // for Cost, Cost::infinity
+#include "ResolvExpr/ConversionCost.hpp" // for conversionCost
 #include "ResolvExpr/PtrsCastable.hpp"   // for ptrsCastable
-#include "ResolvExpr/Unify.h"            // for typesCompatibleIgnoreQualifiers
+#include "ResolvExpr/Unify.hpp"          // for typesCompatibleIgnoreQualifiers
 
 #if 0
@@ -54 +54 @@
                                 cost = conversionCost( basicType, dst, srcIsLvalue, symtab, env );
                                 if ( Cost::unsafe < cost ) {
-                                        if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                                assert(enumInst->base->base);
-                                                cost = Cost::unsafe;
+                                        if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                                // Always explict cast only for typed enum
+                                                if (enumInst->base->isTyped) cost = Cost::unsafe;
                                         }
                                 }
@@ -63 +63 @@
 
                 void postvisit( const ast::ZeroType * zero ) {
-                        // auto ptr = dynamic_cast< const ast::PointerType * >( dst );
-                        // if ( ptr && basicType->isInteger() ) {
-                        //      // needed for, e.g. unsigned long => void *
-                        //      cost = Cost::unsafe;
-                        // } else {
                         cost = conversionCost( zero, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
                                 if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        assert(enumInst->base->base);
-                                        cost = Cost::unsafe;
+                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
                                 }
                         }
-                        // }
                 }
 
                 void postvisit( const ast::OneType * one ) {
-                        // auto ptr = dynamic_cast< const ast::PointerType * >( dst );
-                        // if ( ptr && basicType->isInteger() ) {
-                        //      // needed for, e.g. unsigned long => void *
-                        //      cost = Cost::unsafe;
-                        // } else {
                         cost = conversionCost( one, dst, srcIsLvalue, symtab, env );
                         if ( Cost::unsafe < cost ) {
-                                if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
-                                        assert(enumInst->base->base);
-                                        cost = Cost::unsafe;
+                                if (auto enumInst = dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        if (enumInst->base->isTyped) cost = Cost::unsafe;
                                 }
                         }
-                        // }
                 }