Changeset 356bb95 for src/ResolvExpr/CastCost.cc

Timestamp:

Apr 15, 2016, 3:04:48 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

385c130

Parents:

29ad0ac (diff), 347c42f (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' into gc_noraii

File:

• src/ResolvExpr/CastCost.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc

@@ -69 +69 @@
                 PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
                 if ( destAsPointer && basicType->isInteger() ) {
-                        //cost = Cost( 1, 0, 0 );
-                        cost = Cost::infinity;
+                        // necessary for, e.g. unsigned long => void*
+                        cost = Cost( 1, 0, 0 );
                 } else {
                         ConversionCost::visit( basicType );
@@ -89 +89 @@
                                 } else if ( castResult < 0 ) {
                                         cost = Cost::infinity;
-                                        //cost = Cost( 1, 0, 0 );
                                 } // if
                         } // if
                 } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
                         if ( destAsBasic->isInteger() ) {
-                                //cost = Cost( 1, 0, 0 );
-                                cost = Cost::infinity;
+                                // necessary for, e.g. void* => unsigned long
+                                cost = Cost( 1, 0, 0 );
                         } // if
                 }