Changeset 6b224a52 for src/ResolvExpr/CastCost.cc

Timestamp:

Aug 25, 2017, 12:11:53 PM (8 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, resolv-new, with_gc

Children:

bf7b9da7

Parents:

135b431 (diff), f676b84 (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/CastCost.cc (modified) (6 diffs)

src/ResolvExpr/CastCost.cc

@@ -49 +49 @@
                                 assert( type );
                                 if ( type->get_base() ) {
-                                        return castCost( src, type->get_base(), indexer, env ) + Cost( 0, 0, 1 );
+                                        return castCost( src, type->get_base(), indexer, env ) + Cost::safe;
                                 } // if
                         } // if
                 } // if
                 if ( typesCompatibleIgnoreQualifiers( src, dest, indexer, env ) ) {
-                        return Cost( 0, 0, 0 );
+                        return Cost::zero;
                 } else if ( dynamic_cast< VoidType* >( dest ) ) {
-                        return Cost( 0, 0, 1 );
+                        return Cost::safe;
+                } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
+                        return convertToReferenceCost( src, refType, indexer, env );
                 } else {
                         CastCost converter( dest, indexer, env );
@@ -64 +66 @@
                         } else {
                                 // xxx - why are we adding cost 0 here?
-                                return converter.get_cost() + Cost( 0, 0, 0 );
+                                return converter.get_cost() + Cost::zero;
                         } // if
                 } // if
@@ -77 +79 @@
                 if ( destAsPointer && basicType->isInteger() ) {
                         // necessary for, e.g. unsigned long => void*
-                        cost = Cost( 1, 0, 0 );
+                        cost = Cost::unsafe;
                 } else {
-                        ConversionCost::visit( basicType );
+                        cost = conversionCost( basicType, dest, indexer, env );
                 } // if
         }
@@ -86 +88 @@
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
-                                cost = Cost( 0, 0, 1 );
+                                cost = Cost::safe;
                         } else {
                                 TypeEnvironment newEnv( env );
@@ -93 +95 @@
                                 int castResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
                                 if ( castResult > 0 ) {
-                                        cost = Cost( 0, 0, 1 );
+                                        cost = Cost::safe;
                                 } else if ( castResult < 0 ) {
                                         cost = Cost::infinity;
@@ -101 +103 @@
                         if ( destAsBasic->isInteger() ) {
                                 // necessary for, e.g. void* => unsigned long
-                                cost = Cost( 1, 0, 0 );
+                                cost = Cost::unsafe;
                         } // if
                 }