Changeset 2fd9f24

Timestamp:

Nov 16, 2018, 10:57:03 AM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0b00df0

Parents:

fbecee5

Message:

IdChain? tweaks to resolver

Location:

src/ResolvExpr

Files:

• ResolveAssertions.cc (modified) (3 diffs)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/ResolveAssertions.cc

@@ -189 +189 @@
                 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() ) {
-                                a.second.idChain = info.idChain;
-                                a.second.idChain.push_back( decl->get_uniqueId() );
-                        }
-                }
-
                 Expression* varExpr = match.cdata.combine( alt.cvtCost );
                 delete varExpr->result;
@@ -248 +238 @@
                         if ( unify( assn.decl->get_type(), adjType, newEnv, newNeed, have, newOpenVars, 
                                         resn.indexer ) ) {
+                                // set up idChain on new assertions
+                                for ( auto& a : newNeed ) {
+                                        a.second.idChain = assn.info.idChain;
+                                        a.second.idChain.push_back( assn.decl->get_uniqueId() );
+                                }
+
                                 matches.emplace_back( cdata, adjType, std::move(newEnv), std::move(have), 
                                         std::move(newNeed), std::move(newOpenVars) );
@@ -316 +312 @@
                                                 CandidateCost{resn.indexer} );
                                         
-                                        // for ( auto& compat : compatible ) {
                                         for ( auto it = compatible.begin(); it != lmin ; ++it ) {
                                                 auto& compat = *it;

src/ResolvExpr/Resolver.cc

@@ -227 +227 @@
                                 }
 
-                                winners.emplace_back( candidates[i] );
+                                winners.emplace_back( std::move( candidates[i] ) );
                         }