Changeset 150ec33

Timestamp:

Oct 19, 2017, 11:15:35 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:

f232977

Parents:

d411426d

git-author:

Rob Schluntz <rschlunt@…> (10/13/17 16:03:35)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:35)

Message:

Fix bug in computing union conversion costs

Location:

src/ResolvExpr

Files:

• CastCost.cc (modified) (2 diffs)
• ConversionCost.cc (modified) (3 diffs)

src/ResolvExpr/CastCost.cc

@@ -24 +24 @@
 #include "typeops.h"                     // for typesCompatibleIgnoreQualifiers
 
+#if 0
+#define PRINT(x) x
+#else
+#define PRINT(x)
+#endif
 
 namespace ResolvExpr {
@@ -52 +57 @@
                         } // if
                 } // if
+
+                PRINT(
+                        std::cerr << "castCost ::: src is ";
+                        src->print( std::cerr );
+                        std::cerr << std::endl << "dest is ";
+                        dest->print( std::cerr );
+                        std::cerr << std::endl << "env is" << std::endl;
+                        env.print( std::cerr, 8 );
+                )
+
                 if ( typesCompatibleIgnoreQualifiers( src, dest, indexer, env ) ) {
+                        PRINT( std::cerr << "compatible!" << std::endl; )
                         return Cost::zero;
                 } else if ( dynamic_cast< VoidType* >( dest ) ) {
                         return Cost::safe;
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
+                        PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
                         return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const TypeEnvironment & env, const SymTab::Indexer & indexer) {
                                 return ptrsCastable( t1, t2, env, indexer );

src/ResolvExpr/ConversionCost.cc

@@ -306 +306 @@
                 // recursively compute conversion cost from T1 to T2.
                 // cv can be safely dropped because of 'implicit dereference' behavior.
-                refType->get_base()->accept( *this );
-                if ( refType->get_base()->get_qualifiers() == dest->get_qualifiers() ) {
+                refType->base->accept( *this );
+                if ( refType->base->get_qualifiers() == dest->get_qualifiers() ) {
                         cost.incReference();  // prefer exact qualifiers
-                } else if ( refType->get_base()->get_qualifiers() < dest->get_qualifiers() ) {
+                } else if ( refType->base->get_qualifiers() < dest->get_qualifiers() ) {
                         cost.incSafe(); // then gaining qualifiers
                 } else {
@@ -321 +321 @@
         void ConversionCost::visit(StructInstType *inst) {
                 if ( StructInstType *destAsInst = dynamic_cast< StructInstType* >( dest ) ) {
-                        if ( inst->get_name() == destAsInst->get_name() ) {
+                        if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
                         } // if
@@ -328 +328 @@
 
         void ConversionCost::visit(UnionInstType *inst) {
-                if ( StructInstType *destAsInst = dynamic_cast< StructInstType* >( dest ) ) {
-                        if ( inst->get_name() == destAsInst->get_name() ) {
+                if ( UnionInstType *destAsInst = dynamic_cast< UnionInstType* >( dest ) ) {
+                        if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
                         } // if