Changeset b8b075cd

Timestamp:

Dec 18, 2017, 2:27:47 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

fb57626

Parents:

7641b6c

Message:

Apply different costs to conversion of pointers with different types and same qualifiers vs. more qualifiers

File:

• src/ResolvExpr/ConversionCost.cc (modified) (1 diff)

src/ResolvExpr/ConversionCost.cc

@@ -292 +292 @@
                                         cost = Cost::safe;
                                 }
-                        } else {  // xxx - this discards qualifiers from consideration -- reducing qualifiers is a safe conversion; is this right?
+                        } else {
                                 int assignResult = ptrsAssignable( pointerType->base, destAsPtr->base, env );
                                 PRINT( std::cerr << " :: " << assignResult << std::endl; )
-                                if ( assignResult > 0 && pointerType->get_base()->get_qualifiers() <= destAsPtr->get_qualifiers() ) {
-                                        cost = Cost::safe;
+                                if ( assignResult > 0 && tq1 <= tq2 ) {
+                                        // xxx - want the case where qualifiers are added to be more expensive than the case where qualifiers are the same. Is 1 safe vs. 2 safe correct?
+                                        if ( tq1 == tq2 ) {
+                                                cost = Cost::safe;
+                                        } else if ( tq1 < tq2 ) {
+                                                cost = Cost::safe+Cost::safe;
+                                        }
                                 } else if ( assignResult < 0 ) {
                                         cost = Cost::unsafe;