Changeset 6e027d6

Timestamp:

Dec 14, 2017, 10:50:11 AM (7 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:

74cdfb1

Parents:

c470ada

Message:

Fix costs for conversion between compatible reference types

File:

• src/ResolvExpr/ConversionCost.cc (modified) (4 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -92 +92 @@
 
         Cost convertToReferenceCost( Type * src, Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
-                PRINT( std::cerr << "convert to reference cost... diff " << diff << std::endl; )
+                PRINT( std::cerr << "convert to reference cost... diff " << diff << " " << src << " / " << dest << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
@@ -108 +108 @@
                         if ( srcAsRef && destAsRef ) { // pointer-like conversions between references
                                 PRINT( std::cerr << "converting between references" << std::endl; )
-                                if ( srcAsRef->get_base()->get_qualifiers() <= destAsRef->get_base()->get_qualifiers() && typesCompatibleIgnoreQualifiers( srcAsRef->get_base(), destAsRef->get_base(), indexer, env ) ) {
-                                        return Cost::safe;
+                                Type::Qualifiers tq1 = srcAsRef->get_base()->get_qualifiers();
+                                Type::Qualifiers tq2 = destAsRef->get_base()->get_qualifiers();
+                                if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( srcAsRef->get_base(), destAsRef->get_base(), indexer, env ) ) {
+                                        PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
+                                        if ( tq1 == tq2 ) {
+                                                // types are the same
+                                                return Cost::zero;
+                                        } else {
+                                                // types are the same, except otherPointer has more qualifiers
+                                                return Cost::safe;
+                                        }
                                 } else {  // xxx - this discards reference qualifiers from consideration -- reducing qualifiers is a safe conversion; is this right?
                                         int assignResult = func( srcAsRef->get_base(), destAsRef->get_base(), env, indexer );
@@ -271 +280 @@
         void ConversionCost::visit( PointerType * pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
-                        PRINT( std::cerr << pointerType << " ===> " << destAsPtr; )
+                        PRINT( std::cerr << pointerType << " ===> " << destAsPtr << std::endl; )
                         Type::Qualifiers tq1 = pointerType->get_base()->get_qualifiers();
                         Type::Qualifiers tq2 = destAsPtr->get_base()->get_qualifiers();
                         if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
+                                PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
                                 if ( tq1 == tq2 ) {
                                         // types are the same
@@ -280 +290 @@
                                 } else {
                                         // types are the same, except otherPointer has more qualifiers
-                                        PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
                                         cost = Cost::safe;
                                 }