Changeset 6c3a988f for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Jan 5, 2017, 3:47:36 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, 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, resolv-new, with_gc

Children:

f831177

Parents:

1e3d5b6

Message:

fix inferred parameter data structures to correctly associate parameters with the entity that requested them, modify tuple specialization and unification to work with self-recursive assertions

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (7 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -339 +339 @@
                         unifiableVars[ (*tyvar)->get_name() ] = TypeDecl::Data{ *tyvar };
                         for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
-                                needAssertions[ *assert ] = true;
+                                needAssertions[ *assert ].isUsed = true;
                         }
 ///     needAssertions.insert( needAssertions.end(), (*tyvar)->get_assertions().begin(), (*tyvar)->get_assertions().end() );
@@ -380 +380 @@
                         }
                         *out++ = arg;
-                        return true;
                 } else if ( actualIt != actualEnd ) {
                         // both actualType and formalType are atomic (non-tuple) types - if they unify
@@ -467 +466 @@
         void addToIndexer( AssertionSet &assertSet, SymTab::Indexer &indexer ) {
                 for ( AssertionSet::iterator i = assertSet.begin(); i != assertSet.end(); ++i ) {
-                        if ( i->second == true ) {
+                        if ( i->second.isUsed ) {
                                 i->first->accept( indexer );
                         }
@@ -478 +477 @@
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
+                                PRINT(
+                                        std::cerr << "all assertions satisfied, output alternative: ";
+                                        newAlt.print( std::cerr );
+                                        std::cerr << std::endl;
+                                );
                                 *out++ = newAlt;
                                 return;
@@ -494 +498 @@
 
                 ForwardIterator cur = begin++;
-                if ( ! cur->second ) {
+                if ( ! cur->second.isUsed ) {
                         inferRecursive( begin, end, newAlt, openVars, decls, newNeed, /*needParents,*/ level, indexer, out );
                         return; // xxx - should this continue? previously this wasn't here, and it looks like it should be
@@ -538 +542 @@
                                 assert( (*candidate)->get_uniqueId() );
                                 DeclarationWithType *candDecl = static_cast< DeclarationWithType* >( Declaration::declFromId( (*candidate)->get_uniqueId() ) );
+
+                                // everything with an empty idChain was pulled in by the current assertion.
+                                // add current assertion's idChain + current assertion's ID so that the correct inferParameters can be found.
+                                for ( auto & a : newerNeed ) {
+                                        if ( a.second.idChain.empty() ) {
+                                                a.second.idChain = cur->second.idChain;
+                                                a.second.idChain.push_back( curDecl->get_uniqueId() );
+                                        }
+                                }
+
                                 //AssertionParentSet newNeedParents( needParents );
                                 // skip repeatingly-self-recursive assertion satisfaction
@@ -553 +567 @@
                                 )
                                 ApplicationExpr *appExpr = static_cast< ApplicationExpr* >( newerAlt.expr );
+                                // follow the current assertion's ID chain to find the correct set of inferred parameters to add the candidate to (i.e. the set of inferred parameters belonging to the entity which requested the assertion parameter).
+                                InferredParams * inferParameters = &appExpr->get_inferParams();
+                                for ( UniqueId id : cur->second.idChain ) {
+                                        inferParameters = (*inferParameters)[ id ].inferParams.get();
+                                }
                                 // XXX: this is a memory leak, but adjType can't be deleted because it might contain assertions
-                                appExpr->get_inferParams()[ curDecl->get_uniqueId() ] = ParamEntry( (*candidate)->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
+                                (*inferParameters)[ curDecl->get_uniqueId() ] = ParamEntry( (*candidate)->get_uniqueId(), adjType->clone(), curDecl->get_type()->clone(), varExpr );
                                 inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, /*newNeedParents,*/ level, indexer, out );
                         } else {