Ignore:
Timestamp:
Aug 19, 2020, 2:09:04 PM (16 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
03a4c73
Parents:
133a161 (diff), 13d33a7 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/CandidateFinder.cpp

    r133a161 r8e9d567  
    14731473                                        // unification run for side-effects
    14741474                                        unify( toType, cand->expr->result, env, need, have, open, symtab );
    1475                                         Cost thisCost = castCost( cand->expr->result, toType, cand->expr->get_lvalue(),
     1475                                        Cost thisCost = computeConversionCost( cand->expr->result, toType, cand->expr->get_lvalue(),
    14761476                                                        symtab, env );
    14771477
     
    14831483                                                                initExpr->location, restructureCast( cand->expr, toType ),
    14841484                                                                initAlt.designation },
    1485                                                         copy( cand->env ), move( open ), move( need ), cand->cost, thisCost );
     1485                                                        move(env), move( open ), move( need ), cand->cost, thisCost );
    14861486                                                inferParameters( newCand, matches );
    14871487                                        }
Note: See TracChangeset for help on using the changeset viewer.