Merge pull request #33299 from xedin/rdar-65413640-5.3

[5.3][Diagnostics] Detect and diagnose type mismatches related to function…

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -2107,6 +2107,11 @@ bool ContextualFailure::diagnoseAsError() {
     return true;
   }
 
+  case ConstraintLocator::FunctionBuilderBodyResult: {
+    diagnostic = *getDiagnosticFor(CTP_Initialization, toType);
+    break;
+  }
+
   default:
     return false;
   }

lib/Sema/CSSimplify.cpp

@@ -4264,6 +4264,12 @@ bool ConstraintSystem::repairFailures(
     break;
   }
 
+  case ConstraintLocator::FunctionBuilderBodyResult: {
+    conversionsOrFixes.push_back(ContextualMismatch::create(
+        *this, lhs, rhs, getConstraintLocator(locator)));
+    break;
+  }
+
   default:
     break;
   }

lib/Sema/ConstraintSystem.cpp

@@ -3531,6 +3531,11 @@ void constraints::simplifyLocator(Expr *&anchor,
       continue;
     }
 
+    case ConstraintLocator::FunctionBuilderBodyResult: {
+      path = path.slice(1);
+      break;
+    }
+
     default:
       // FIXME: Lots of other cases to handle.
       break;

test/Constraints/function_builder_diags.swift

@@ -602,4 +602,8 @@ struct MyView {
     case . // expected-error {{expected ':' after 'case'}}
     } // expected-error {{expected identifier after '.' expression}}
   }
+
+  @TupleBuilder var invalidConversion: Int {
+    "" // expected-error {{cannot convert value of type 'String' to specified type 'Int'}}
+  }
 }