Changeset adb6a4f1 for src/ResolvExpr/PtrsCastable.cc

Timestamp:

Jun 1, 2018, 7:53:55 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

d56cc219

Parents:

ecae5860 (diff), 262bd63 (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 plg2:software/cfa/cfa-cc

File:

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

src/ResolvExpr/PtrsCastable.cc

@@ -57 +57 @@
                                 return -1;
                         } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
-                                EqvClass eqvClass;
                                 if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
                                         if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
@@ -64 +63 @@
                                                 } // if
                                         } //if
-                                } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
-                                        if ( eqvClass.data.kind == TypeDecl::Ftype ) {
+                                } else if ( const EqvClass *eqvClass = env.lookup( typeInst->get_name() ) ) {
+                                        if ( eqvClass->data.kind == TypeDecl::Ftype ) {
                                                 return -1;
                                         } // if
@@ -79 +78 @@
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        EqvClass eqvClass;
-                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
                                 // xxx - should this be ptrsCastable?
-                                return ptrsAssignable( src, eqvClass.type, env );
+                                return ptrsAssignable( src, eqvClass->type, env );
                         } // if
                 } // if