Changes in src/ResolvExpr/PtrsAssignable.cc [00ac42e:f07c1e6]

File:

• src/ResolvExpr/PtrsAssignable.cc (modified) (2 diffs)

src/ResolvExpr/PtrsAssignable.cc

@@ -51 +51 @@
                 // std::cerr << "assignable: " << src << " | " << dest << std::endl;
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
-                                return ptrsAssignable( src, eqvClass->type, env );
+                        EqvClass eqvClass;
+                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                                return ptrsAssignable( src, eqvClass.type, env );
                         } // if
                 } // if
@@ -94 +95 @@
         void PtrsAssignable::postvisit(  __attribute__((unused)) TraitInstType *inst ) {}
         void PtrsAssignable::postvisit( TypeInstType *inst ) {
-                if ( const EqvClass *eqvClass = env.lookup( inst->get_name() ) ) {
-                        if ( eqvClass->type ) {
-                                // T * = S * for any S depends on the type bound to T
-                                result = ptrsAssignable( eqvClass->type, dest, env );
-                        }
+                EqvClass eqvClass;
+                if ( env.lookup( inst->get_name(), eqvClass ) && eqvClass.type ) {
+                        // T * = S * for any S depends on the type bound to T
+                        result = ptrsAssignable( eqvClass.type, dest, env );
                 } // if
         }