Changes in src/ResolvExpr/ConversionCost.cc [98278b3a:5af7306]

File:

• src/ResolvExpr/ConversionCost.cc (modified) (4 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -20 +20 @@
 #include <string>                        // for operator==, string
 
+#include "Common/GC.h"                   // for new_static_root
 #include "ResolvExpr/Cost.h"             // for Cost
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
@@ -275 +276 @@
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost::unsafe;
-                } // if
-                // no cases for zero_t/one_t because it should not be possible to convert int, etc. to zero_t/one_t.
+                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
+                        cost = Cost::unsafe;
+                } // if
         }
 
@@ -308 +310 @@
                                 // assignResult == 0 means Cost::Infinity
                         } // if
-                        // case case for zero_t because it should not be possible to convert pointers to zero_t.
+                } else if ( dynamic_cast< ZeroType * >( dest ) ) {
+                        cost = Cost::unsafe;
                 } // if
         }
@@ -351 +354 @@
         void ConversionCost::postvisit( EnumInstType * ) {
                 static Type::Qualifiers q;
-                static BasicType integer( q, BasicType::SignedInt );
-                cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
+                static BasicType* integer = new_static_root<BasicType>( q, BasicType::SignedInt );
+                cost = costFunc( integer, dest, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();