Merge pull request #16167 from slavapestov/diag-crashes-4.2

Two trivial fixes for crashes during diagnostics [4.2]

Author: slavapestov

lib/Sema/CSApply.cpp

@@ -8468,6 +8468,11 @@ Solution::convertBooleanTypeToBuiltinI1(Expr *expr,
 
   auto type = cs.getType(expr);
 
+  // We allow UnresolvedType <c $T for all $T, so we might end up here
+  // in diagnostics. Just bail out.
+  if (type->is<UnresolvedType>())
+    return expr;
+
   // Look for the builtin name. If we don't have it, we need to call the
   // general name via the witness table.
   NameLookupOptions lookupOptions = defaultMemberLookupOptions;

lib/Sema/CSDiag.cpp

@@ -6532,18 +6532,18 @@ bool FailureDiagnosis::diagnoseClosureExpr(
     }
 
     expectedResultType = fnType->getResult();
-  } else {
-    // Defend against type variables from our constraint system leaking into
-    // recursive constraints systems formed when checking the body of the
-    // closure.  These typevars come into them when the body does name
-    // lookups against the parameter decls.
-    //
-    // Handle this by rewriting the arguments to UnresolvedType().
-    for (auto VD : *CE->getParameters()) {
-      if (VD->getType()->hasTypeVariable() || VD->getType()->hasError()) {
-        VD->setType(CS.getASTContext().TheUnresolvedType);
-        VD->setInterfaceType(VD->getType()->getInOutObjectType());
-      }
+  }
+
+  // Defend against type variables from our constraint system leaking into
+  // recursive constraints systems formed when checking the body of the
+  // closure.  These typevars come into them when the body does name
+  // lookups against the parameter decls.
+  //
+  // Handle this by rewriting the arguments to UnresolvedType().
+  for (auto VD : *CE->getParameters()) {
+    if (VD->getType()->hasTypeVariable() || VD->getType()->hasError()) {
+      VD->setType(CS.getASTContext().TheUnresolvedType);
+      VD->setInterfaceType(VD->getType()->getInOutObjectType());
     }
   }
 

test/Constraints/closures.swift

@@ -690,3 +690,24 @@ func rdar37790062() {
   _ = S({ bzz(C1()) }, { bar() }) // expected-warning {{result of call to 'bzz' is unused}}
   _ = S({ faz(C2()) }, { bar() }) // expected-warning {{result of call to 'faz' is unused}}
 }
+
+// <rdar://problem/39489003>
+typealias KeyedItem<K, T> = (key: K, value: T)
+
+protocol Node {
+  associatedtype T
+  associatedtype E
+  associatedtype K
+  var item: E {get set}
+  var children: [(key: K, value: T)] {get set}
+}
+
+extension Node {
+  func getChild(for key:K)->(key: K, value: T) {
+    return children.first(where: { (item:KeyedItem) -> Bool in
+        return item.key == key
+        // expected-error@-1 {{binary operator '==' cannot be applied to operands of type '_' and 'Self.K'}}
+        // expected-note@-2 {{overloads for '==' exist with these partially matching parameter lists:}}
+      })
+  }
+}

test/Constraints/if_expr.swift

@@ -63,3 +63,25 @@ let ib: Bool! = false
 let eb: Bool? = .some(false)
 let conditional = ib ? "Broken" : "Heart" // should infer Bool!
 let conditional = eb ? "Broken" : "Heart" // expected-error {{value of optional type 'Bool?' not unwrapped; did you mean to use '!' or '?'?}}
+
+// <rdar://problem/39586166> - crash when IfExpr has UnresolvedType in condition
+struct Delegate {
+  var shellTasks: [ShellTask]
+}
+
+extension Array {
+  subscript(safe safe: Int) -> Element? { // expected-note {{found this candidate}}
+    get { }
+    set { }
+  }
+}
+
+struct ShellTask {
+  var commandLine: [String]
+}
+
+let delegate = Delegate(shellTasks: [])
+_ = delegate.shellTasks[safe: 0]?.commandLine.compactMap({ $0.asString.hasPrefix("") ? $0 : nil }).count ?? 0
+// expected-error@-1 {{ambiguous reference to member 'subscript'}}
+
+// FIXME: Horrible diagnostic, but at least we no longer crash