Changeset eef8dfb for src/ResolvExpr/PtrsCastable.cc

Timestamp:

Jan 7, 2021, 2:55:57 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

58fe85a

Parents:

bdfc032 (diff), 44e37ef (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' into dkobets-vector

File:

• src/ResolvExpr/PtrsCastable.cc (modified) (3 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -180 +180 @@
                                         }
                                 }
-                        } else if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                        } else if ( const ast::EqvClass * eqvClass = env.lookup( *inst ) ) {
                                 if ( eqvClass->data.kind == ast::TypeDecl::Ftype ) {
                                         return -1;
@@ -283 +283 @@
 ) {
         if ( auto inst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
-                if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                if ( const ast::EqvClass * eqvClass = env.lookup( *inst ) ) {
                         return ptrsAssignable( src, eqvClass->bound, env );
                 }
@@ -293 +293 @@
                 ast::Pass< PtrsCastable_new > ptrs{ dst, env, symtab };
                 src->accept( ptrs );
-                return ptrs.pass.result;
+                return ptrs.core.result;
         }
 }