Changes in src/ResolvExpr/CastCost.cc [8e18b8e:bd0b6b62]

File:

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

src/ResolvExpr/CastCost.cc

@@ -43 +43 @@
         Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
-                                if ( eqvClass->type ) {
-                                        return castCost( src, eqvClass->type, indexer, env );
+                        EqvClass eqvClass;
+                        NamedTypeDecl *namedType;
+                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                                if ( eqvClass.type ) {
+                                        return castCost( src, eqvClass.type, indexer, env );
                                 } else {
                                         return Cost::infinity;
                                 }
-                        } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) {
+                        } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
                                 // all typedefs should be gone by this point
                                 TypeDecl *type = strict_dynamic_cast< TypeDecl* >( namedType );