Changes in src/ResolvExpr/ConversionCost.cc [8e18b8e:98278b3a]

File:

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

src/ResolvExpr/ConversionCost.cc

@@ -20 +20 @@
 #include <string>                        // for operator==, string
 
-#include "Common/GC.h"                   // for new_static_root
 #include "ResolvExpr/Cost.h"             // for Cost
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
@@ -43 +42 @@
         Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
+                        EqvClass eqvClass;
+                        NamedTypeDecl *namedType;
                         PRINT( std::cerr << "type inst " << destAsTypeInst->name; )
-                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->name ) ) {
-                                if ( eqvClass->type ) {
-                                        return conversionCost( src, eqvClass->type, indexer, env );
+                        if ( env.lookup( destAsTypeInst->name, eqvClass ) ) {
+                                if ( eqvClass.type ) {
+                                        return conversionCost( src, eqvClass.type, indexer, env );
                                 } else {
                                         return Cost::infinity;
                                 }
-                        } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->name ) ) {
+                        } else if ( ( namedType = indexer.lookupType( destAsTypeInst->name ) ) ) {
                                 PRINT( std::cerr << " found" << std::endl; )
                                 TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
@@ -350 +351 @@
         void ConversionCost::postvisit( EnumInstType * ) {
                 static Type::Qualifiers q;
-                static BasicType* integer = new_static_root<BasicType>( q, BasicType::SignedInt );
-                cost = costFunc( integer, dest, indexer, env );  // safe if dest >= int
+                static BasicType integer( q, BasicType::SignedInt );
+                cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();
@@ -360 +361 @@
 
         void ConversionCost::postvisit( TypeInstType *inst ) {
-                if ( const EqvClass *eqvClass = env.lookup( inst->name ) ) {
-                        cost = costFunc( eqvClass->type, dest, indexer, env );
+                EqvClass eqvClass;
+                NamedTypeDecl *namedType;
+                if ( env.lookup( inst->name, eqvClass ) ) {
+                        cost = costFunc( eqvClass.type, dest, indexer, env );
                 } else if ( TypeInstType *destAsInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
                         }
-                } else if ( NamedTypeDecl *namedType = indexer.lookupType( inst->name ) ) {
+                } else if ( ( namedType = indexer.lookupType( inst->name ) ) ) {
                         TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
                         // all typedefs should be gone by this point