Changeset 6fa409e

Timestamp:

Aug 31, 2018, 10:14:28 AM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Parents:

1a59641

Message:

Fixed bug in breadth-first order, build exceeds local memory, can't test

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -691 +691 @@
                         DeclarationWithType* candidate = match.cdata.id;
                         assertf( candidate->get_uniqueId(), "Assertion candidate does not have a unique ID: %s", toString( candidate ).c_str() );
+                        
+                        // 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 : match.need ) {
                                 if ( a.second.idChain.empty() ) {
@@ -758 +762 @@
                         addToIndexer( match.have, resn.indexer );
                         resn.newNeed.insert( match.need.begin(), match.need.end() );
+                        resn.alt.env = std::move(match.env);
                         resn.openVars = std::move(match.openVars);
-                        resn.alt.env = std::move(match.env);
 
                         bindAssertion( curDecl, assnInfo, resn.alt, match );
@@ -865 +869 @@
                                                         AssertionPack match = el.match;
                                                         addToIndexer( match.have, new_resn.indexer );
-                                                        resn.newNeed.insert( match.need.begin(), match.need.end() );
+                                                        new_resn.newNeed.insert( match.need.begin(), match.need.end() );
                                                         
                                                         bindAssertion( el.curDecl, el.assnInfo, new_resn.alt, match );