Changeset 8a930c03 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Jun 12, 2023, 12:05:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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) (9 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -373 +373 @@
                                                         unify(
                                                                 ttype, argType, newResult.env, newResult.need, newResult.have,
-                                                                newResult.open, symtab )
+                                                                newResult.open )
                                                 ) {
                                                         finalResults.emplace_back( std::move( newResult ) );
@@ -444 +444 @@
                                 )
 
-                                if ( unify( paramType, argType, env, need, have, open, symtab ) ) {
+                                if ( unify( paramType, argType, env, need, have, open ) ) {
                                         unsigned nextExpl = results[i].nextExpl + 1;
                                         if ( nextExpl == expl.exprs.size() ) { nextExpl = 0; }
@@ -463 +463 @@
                                         ast::OpenVarSet open = results[i].open;
 
-                                        if ( unify( paramType, cnst->result, env, need, have, open, symtab ) ) {
+                                        if ( unify( paramType, cnst->result, env, need, have, open ) ) {
                                                 results.emplace_back(
                                                         i, new ast::DefaultArgExpr{ cnst->location, cnst }, std::move( env ),
@@ -506 +506 @@
 
                                 // attempt to unify types
-                                if ( unify( paramType, argType, env, need, have, open, symtab ) ) {
+                                if ( unify( paramType, argType, env, need, have, open ) ) {
                                         // add new result
                                         results.emplace_back(
@@ -750 +750 @@
                         const ast::Type * returnType = funcType->returns.front();
                         if ( ! unify(
-                                returnType, targetType, funcEnv, funcNeed, funcHave, funcOpen, symtab )
+                                returnType, targetType, funcEnv, funcNeed, funcHave, funcOpen )
                         ) {
                                 // unification failed, do not pursue this candidate
@@ -1159 +1159 @@
 
                         // unification run for side-effects
-                        unify( toType, cand->expr->result, cand->env, need, have, open, symtab );
+                        unify( toType, cand->expr->result, cand->env, need, have, open );
                         Cost thisCost =
                                 (castExpr->isGenerated == ast::GeneratedFlag::GeneratedCast)
@@ -1483 +1483 @@
                                         if (
                                                 unify(
-                                                        r2->expr->result, r3->expr->result, env, need, have, open, symtab,
+                                                        r2->expr->result, r3->expr->result, env, need, have, open,
                                                         common )
                                         ) {
@@ -1556 +1556 @@
                                 if (
                                         unify(
-                                                r1->expr->result, r2->expr->result, env, need, have, open, symtab,
+                                                r1->expr->result, r2->expr->result, env, need, have, open,
                                                 common )
                                 ) {
@@ -1659 +1659 @@
 
                                 // unification run for side-effects
-                                bool canUnify = unify( toType, cand->expr->result, env, need, have, open, symtab );
+                                bool canUnify = unify( toType, cand->expr->result, env, need, have, open );
                                 (void) canUnify;
                                 Cost thisCost = computeConversionCost( cand->expr->result, toType, cand->expr->get_lvalue(),