Changeset 4a368547 for src/ResolvExpr/CastCost.cc

Timestamp:

May 29, 2017, 3:08:47 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:

2ab67b9, a029714

Parents:

ff98952 (diff), 4c5b972 (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/CastCost.cc (modified) (3 diffs)

src/ResolvExpr/CastCost.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CastCost.cc -- 
+// CastCost.cc --
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
           public:
                 CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-  
+
                 virtual void visit( BasicType *basicType );
                 virtual void visit( PointerType *pointerType );
@@ -36 +36 @@
                         NamedTypeDecl *namedType;
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
-                                return castCost( src, eqvClass.type, indexer, env );
+                                if ( eqvClass.type ) {
+                                        return castCost( src, eqvClass.type, indexer, env );
+                                } else {
+                                        return Cost::infinity;
+                                }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
                                 TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );