Changes in src/ResolvExpr/CandidateFinder.cpp [0292aa4:954c954]

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -43 +43 @@
 #include "SymTab/Validate.h"      // for validateType
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
-#include "InitTweak/InitTweak.h"  // for getPointerBase
-
-#include "Common/Stats/Counter.h"
 
 #define PRINT( text ) if ( resolvep ) { text }
@@ -867 +864 @@
 
                 void postvisit( const ast::UntypedExpr * untypedExpr ) {
+                        CandidateFinder funcFinder{ symtab, tenv };
+                        funcFinder.find( untypedExpr->func, ResolvMode::withAdjustment() );
+                        // short-circuit if no candidates
+                        if ( funcFinder.candidates.empty() ) return;
+
+                        reason.code = NoMatch;
+
                         std::vector< CandidateFinder > argCandidates =
                                 selfFinder.findSubExprs( untypedExpr->args );
@@ -873 +877 @@
                         // if not tuple assignment, handled as normal function call
                         Tuples::handleTupleAssignment( selfFinder, untypedExpr, argCandidates );
-
-                        CandidateFinder funcFinder{ symtab, tenv };
-                        if (auto nameExpr = untypedExpr->func.as<ast::NameExpr>()) {
-                                auto kind = ast::SymbolTable::getSpecialFunctionKind(nameExpr->name);
-                                if (kind != ast::SymbolTable::SpecialFunctionKind::NUMBER_OF_KINDS) {
-                                        assertf(!argCandidates.empty(), "special function call without argument");
-                                        for (auto & firstArgCand: argCandidates[0]) {
-                                                ast::ptr<ast::Type> argType = firstArgCand->expr->result;
-                                                firstArgCand->env.apply(argType);
-                                                // strip references
-                                                // xxx - is this correct?
-                                                while (argType.as<ast::ReferenceType>()) argType = argType.as<ast::ReferenceType>()->base;
-
-                                                // convert 1-tuple to plain type
-                                                if (auto tuple = argType.as<ast::TupleType>()) {
-                                                        if (tuple->size() == 1) {
-                                                                argType = tuple->types[0];
-                                                        }
-                                                }
-                                                
-                                                // if argType is an unbound type parameter, all special functions need to be searched.
-                                                if (isUnboundType(argType)) {
-                                                        funcFinder.otypeKeys.clear();
-                                                        break;
-                                                }
-
-                                                if (argType.as<ast::PointerType>()) funcFinder.otypeKeys.insert(Mangle::Encoding::pointer);
-                                                else funcFinder.otypeKeys.insert(Mangle::mangle(argType, Mangle::NoGenericParams | Mangle::Type));
-                                        }
-                                }
-                        }
-                        // if candidates are already produced, do not fail
-                        // xxx - is it possible that handleTupleAssignment and main finder both produce candidates?
-                        // this means there exists ctor/assign functions with a tuple as first parameter.
-                        funcFinder.find( untypedExpr->func, selfFinder.candidates.empty() ? ResolvMode::withAdjustment() : ResolvMode::withoutFailFast() );
-                        // short-circuit if no candidates
-                        // if ( funcFinder.candidates.empty() ) return;
-
-                        reason.code = NoMatch;
 
                         // find function operators
@@ -1101 +1066 @@
                                 // unification run for side-effects
                                 unify( toType, cand->expr->result, cand->env, need, have, open, symtab );
-                                Cost thisCost = 
-                                        (castExpr->isGenerated == ast::GeneratedFlag::GeneratedCast)
-                            ? conversionCost( cand->expr->result, toType, cand->expr->get_lvalue(), symtab, cand->env )
-                            : castCost( cand->expr->result, toType, cand->expr->get_lvalue(), symtab, cand->env );
-
+                                Cost thisCost = castCost( cand->expr->result, toType, cand->expr->get_lvalue(),
+                                                symtab, cand->env );
                                 PRINT(
                                         std::cerr << "working on cast with result: " << toType << std::endl;
@@ -1225 +1187 @@
 
                 void postvisit( const ast::NameExpr * nameExpr ) {
-                        std::vector< ast::SymbolTable::IdData > declList;
-                        if (!selfFinder.otypeKeys.empty()) {
-                                auto kind = ast::SymbolTable::getSpecialFunctionKind(nameExpr->name);
-                                assertf(kind != ast::SymbolTable::SpecialFunctionKind::NUMBER_OF_KINDS, "special lookup with non-special target: %s", nameExpr->name.c_str());
-
-                                for (auto & otypeKey: selfFinder.otypeKeys) {
-                                        auto result = symtab.specialLookupId(kind, otypeKey);
-                                        declList.insert(declList.end(), std::make_move_iterator(result.begin()), std::make_move_iterator(result.end()));
-                                }
-                        }
-                        else {
-                                declList = symtab.lookupId( nameExpr->name );
-                        }
+                        std::vector< ast::SymbolTable::IdData > declList = symtab.lookupId( nameExpr->name );
                         PRINT( std::cerr << "nameExpr is " << nameExpr->name << std::endl; )
-
                         if( declList.empty() ) return;
 
@@ -1594 +1543 @@
 
                                         // unification run for side-effects
-                                        bool canUnify = unify( toType, cand->expr->result, env, need, have, open, symtab );
-                                        (void) canUnify;
+                                        unify( toType, cand->expr->result, env, need, have, open, symtab );
                                         Cost thisCost = computeConversionCost( cand->expr->result, toType, cand->expr->get_lvalue(),
-                                                symtab, env );
-                                        PRINT(
-                                                Cost legacyCost = castCost( cand->expr->result, toType, cand->expr->get_lvalue(),
                                                         symtab, env );
-                                                std::cerr << "Considering initialization:";
-                                                std::cerr << std::endl << "  FROM: " << cand->expr->result << std::endl;
-                                                std::cerr << std::endl << "  TO: "   << toType             << std::endl;
-                                                std::cerr << std::endl << "  Unification " << (canUnify ? "succeeded" : "failed");
-                                                std::cerr << std::endl << "  Legacy cost " << legacyCost;
-                                                std::cerr << std::endl << "  New cost " << thisCost;
-                                                std::cerr << std::endl;
-                                        )
+
                                         if ( thisCost != Cost::infinity ) {
                                                 // count one safe conversion for each value that is thrown away
@@ -1620 +1558 @@
                                         }
                                 }
-
                         }