Changeset b1d3ee1 for src/ResolvExpr/ConversionCost.cc

Timestamp:

May 8, 2019, 10:28:04 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6a625de, 7bb6bd8

Parents:

cedb545 (diff), 1c9568f (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) (3 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 26 16:33:04 2019
-// Update Count     : 24
+// Last Modified On : Mon May  6 14:18:22 2019
+// Update Count     : 25
 //
 
@@ -249 +249 @@
                 /*_FLDXC*/ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0, },
         }; // costMatrix
+        static const int maxIntCost = 15;
         // GENERATED END
         static_assert(
@@ -461 +462 @@
                         } // if
                 } else if ( dynamic_cast< PointerType* >( dest ) ) {
-                        cost = Cost::safe;
+                        cost = Cost::zero;
+                        cost.incSafe( maxIntCost + 2 ); // +1 for zero_t -> int, +1 for disambiguation
                 } // if
         }