Concrete types are preferred over generic types when performing funct…

…ion deduction
jfecher · Jul 20, 2017 · 62a0e62 · 62a0e62
1 parent 25ce897
commit 62a0e62
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/function.cpp b/src/function.cpp
@@ -730,7 +730,7 @@ vector<pair<TypeCheckResult,FuncDecl*>> filterHighestMatches(vector<pair<TypeChe
     vector<pair<TypeCheckResult,FuncDecl*>> highestMatches;
 
     for(auto &tcr : matches){
-        if(tcr.first->matches >= highestMatch){
+        if(!!tcr.first and tcr.first->matches >= highestMatch){
             if(tcr.first->matches > highestMatch){
                 highestMatch = tcr.first->matches;
                 highestMatches.clear();

diff --git a/src/types.cpp b/src/types.cpp
@@ -737,7 +737,6 @@ TypeCheckResult TypeCheckResult::success(){
 TypeCheckResult TypeCheckResult::successWithTypeVars(){
     if(box->res != Failure){
         box->res = SuccessWithTypeVars;
-        box->matches++;
     }
     return *this;
 }