Changeset d60ccbf for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -343 +343 @@
         }
 
+        /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
                 for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
@@ -697 +698 @@
                         std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
                         std::advance( candidate_end, castExpr->get_results().size() );
-                        if ( ! unifyList( (*i).expr->get_results().begin(), candidate_end,
-                                                         castExpr->get_results().begin(), castExpr->get_results().end(), i->env, needAssertions, haveAssertions, openVars, indexer ) ) continue;
                         Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
                                                                                   castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );