Changeset 982832e for src/ResolvExpr

Timestamp:

Sep 13, 2017, 2:44:01 PM (7 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:

ba54f7d, c935c3a

Parents:

e3e16bc (diff), 7dc09294 (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

Location:

src/ResolvExpr

Files:

• CastCost.cc (modified) (1 diff)
• ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc

@@ -45 +45 @@
                                 }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
-                                TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
                                 // all typedefs should be gone by this point
-                                assert( type );
+                                TypeDecl *type = strict_dynamic_cast< TypeDecl* >( namedType );
                                 if ( type->get_base() ) {
                                         return castCost( src, type->get_base(), indexer, env ) + Cost::safe;

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..." << std::endl; )
+                PRINT( std::cerr << "convert to reference cost... diff " << diff << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
@@ -128 +128 @@
                         ReferenceType * destAsRef = dynamic_cast< ReferenceType * >( dest );
                         assert( diff == -1 && destAsRef );
+                        PRINT( std::cerr << "dest is: " << dest << " / src is: " << src << std::endl; )
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->get_base(), indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )