Changeset 8e9d567 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Aug 19, 2020, 2:09:04 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

03a4c73

Parents:

133a161 (diff), 13d33a75 (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:

• src/ResolvExpr/CandidateFinder.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1473 +1473 @@
                                         // unification run for side-effects
                                         unify( toType, cand->expr->result, env, need, have, open, symtab );
-                                        Cost thisCost = castCost( cand->expr->result, toType, cand->expr->get_lvalue(),
+                                        Cost thisCost = computeConversionCost( cand->expr->result, toType, cand->expr->get_lvalue(),
                                                         symtab, env );
 
@@ -1483 +1483 @@
                                                                 initExpr->location, restructureCast( cand->expr, toType ),
                                                                 initAlt.designation },
-                                                        copy( cand->env ), move( open ), move( need ), cand->cost, thisCost );
+                                                        move(env), move( open ), move( need ), cand->cost, thisCost );
                                                 inferParameters( newCand, matches );
                                         }