Changeset 24d6572 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Jun 12, 2023, 2:45:32 PM (13 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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 ast-experimental

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -23 +23 @@
 #include <vector>
 
+#include "AdjustExprType.hpp"
 #include "Candidate.hpp"
 #include "CompilationState.h"
 #include "Cost.h"
+#include "CastCost.hpp"
+#include "PolyCost.hpp"
+#include "SpecCost.hpp"
+#include "ConversionCost.h"
 #include "ExplodedArg.hpp"
 #include "RenameVars.h"           // for renameTyVars
@@ -403 +408 @@
                                                         unify(
                                                                 ttype, argType, newResult.env, newResult.need, newResult.have,
-                                                                newResult.open, symtab )
+                                                                newResult.open )
                                                 ) {
                                                         finalResults.emplace_back( std::move( newResult ) );
@@ -474 +479 @@
                                 )
 
-                                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; }
@@ -493 +498 @@
                                         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 ),
@@ -536 +541 @@
 
                                 // 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(
@@ -703 +708 @@
                                 if ( selfFinder.strictMode ) {
                                         if ( ! unifyExact(
-                                                returnType, targetType, funcEnv, funcNeed, funcHave, funcOpen, noWiden(), symtab ) // xxx - is no widening correct?
+                                                returnType, targetType, funcEnv, funcNeed, funcHave, funcOpen, noWiden() ) // xxx - is no widening correct?
                                         ) {
                                                 // unification failed, do not pursue this candidate
@@ -711 +716 @@
                                 else {
                                         if ( ! unify(
-                                                returnType, targetType, funcEnv, funcNeed, funcHave, funcOpen, symtab )
+                                                returnType, targetType, funcEnv, funcNeed, funcHave, funcOpen )
                                         ) {
                                                 // unification failed, do not pursue this candidate
@@ -1156 +1161 @@
 
                                 // 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)
@@ -1497 +1502 @@
                                                 if (
                                                         unify(
-                                                                r2->expr->result, r3->expr->result, env, need, have, open, symtab,
+                                                                r2->expr->result, r3->expr->result, env, need, have, open,
                                                                 common )
                                                 ) {
@@ -1571 +1576 @@
                                         if (
                                                 unify(
-                                                        r1->expr->result, r2->expr->result, env, need, have, open, symtab,
+                                                        r1->expr->result, r2->expr->result, env, need, have, open,
                                                         common )
                                         ) {
@@ -1677 +1682 @@
 
                                         // 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(),