Changeset 32cab5b for src/ResolvExpr/ConversionCost.cc

Timestamp:

Apr 17, 2018, 12:01:09 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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/ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -275 +275 @@
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost::unsafe;
-                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
-                        cost = Cost::unsafe;
-                } // if
+                } // if
+                // no cases for zero_t/one_t because it should not be possible to convert int, etc. to zero_t/one_t.
         }
 
@@ -309 +308 @@
                                 // assignResult == 0 means Cost::Infinity
                         } // if
-                } else if ( dynamic_cast< ZeroType * >( dest ) ) {
-                        cost = Cost::unsafe;
+                        // case case for zero_t because it should not be possible to convert pointers to zero_t.
                 } // if
         }