Ignore:
Timestamp:
Nov 18, 2015, 1:06:12 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, string, with_gc
Children:
9ed3237, f066321
Parents:
50eac1b (diff), 4673385 (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 override-autogen

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.cc

    r50eac1b rba407ce  
    698698                        std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
    699699                        std::advance( candidate_end, castExpr->get_results().size() );
     700                        // unification run for side-effects
     701                        unifyList( castExpr->get_results().begin(), castExpr->get_results().end(),
     702                                           (*i).expr->get_results().begin(), candidate_end,
     703                                   i->env, needAssertions, haveAssertions, openVars, indexer );
    700704                        Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
    701                                                                                   castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );
     705                                                                                  castExpr->get_results().begin(), castExpr->get_results().end(),
     706                                                                                  indexer, i->env );
    702707                        if ( thisCost != Cost::infinity ) {
    703708                                // count one safe conversion for each value that is thrown away
Note: See TracChangeset for help on using the changeset viewer.