Changeset 43ee2a8

Timestamp:

Aug 14, 2015, 1:10:27 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, string, with_gc

Children:

09f800b

Parents:

e869d663 (diff), 543159b (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 /u/cforall/software/cfa/cfa-cc

File:

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

src/ResolvExpr/CastCost.cc

@@ -66 +66 @@
 
         void CastCost::visit( BasicType *basicType ) {
-                if ( dynamic_cast< PointerType* >( dest ) ) {
+                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
+                if ( destAsPointer && basicType->isInteger() ) {
                         cost = Cost( 1, 0, 0 );
                 } else {
@@ -77 +78 @@
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
                                 cost = Cost( 0, 0, 1 );
-                        } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
-                                if ( destAsBasic->isInteger() ) {
-                                        cost = Cost( 1, 0, 0 );
-                                } // if
                         } else {
                                 TypeEnvironment newEnv( env );
@@ -92 +89 @@
                                 } // if
                         } // if
-                } // if
+                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                        if ( destAsBasic->isInteger() ) {
+                                cost = Cost( 1, 0, 0 );
+                        } // if
+                }
         }
 } // namespace ResolvExpr