Changeset f28a53a for src/ResolvExpr/CastCost.cc

Timestamp:

Oct 7, 2015, 12:42:10 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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, resolv-new, string, with_gc

Children:

0800284, 50eac1b

Parents:

59cde21 (diff), 1521de2 (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 override-autogen

File:

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

src/ResolvExpr/CastCost.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 06:59:10 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Oct 05 14:48:45 2015
+// Update Count     : 5
 //
 
@@ -56 +56 @@
                                 return Cost::infinity;
                         } else {
+                                // xxx - why are we adding cost 0 here?
                                 return converter.get_cost() + Cost( 0, 0, 0 );
                         } // if
@@ -82 +83 @@
                                 newEnv.add( pointerType->get_forall() );
                                 newEnv.add( pointerType->get_base()->get_forall() );
-                                int assignResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
-                                if ( assignResult > 0 ) {
+                                int castResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
+                                if ( castResult > 0 ) {
                                         cost = Cost( 0, 0, 1 );
-                                } else if ( assignResult < 0 ) {
+                                } else if ( castResult < 0 ) {
                                         cost = Cost( 1, 0, 0 );
                                 } // if