fix two more issues found by the stress tester

Author: nathawes

lib/Sema/CSSimplify.cpp

@@ -5709,8 +5709,13 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
     if (!type1->is<LValueType>() &&
         type2->isExistentialType()) {
 
-      // Penalize conversions to Any.
-      if (kind >= ConstraintKind::Conversion && type2->isAny())
+      // Penalize conversions to Any, unless we're solving for code completion.
+      // Code completion should offer completions both from solutions with
+      // overloads involving Any and those with more specific types because the
+      // completion the user then choses can force the Any overload to be
+      // picked.
+      if (kind >= ConstraintKind::Conversion && type2->isAny() &&
+          !isForCodeCompletion())
         increaseScore(ScoreKind::SK_EmptyExistentialConversion);
 
       conversionsOrFixes.push_back(ConversionRestrictionKind::Existential);

lib/Sema/TypeCheckCodeCompletion.cpp

@@ -183,13 +183,20 @@ class SanitizeExpr : public ASTWalker {
         continue;
       }
 
-      // Restore '@autoclosure'd value.
       if (auto ACE = dyn_cast<AutoClosureExpr>(expr)) {
+        // Restore '@autoclosure'd value.
         // This is only valid if the closure doesn't have parameters.
         if (ACE->getParameters()->size() == 0) {
           expr = ACE->getSingleExpressionBody();
           continue;
         }
+
+        // Restore autoclosure'd function reference.
+        if (auto *unwrapped = ACE->getUnwrappedCurryThunkExpr()) {
+          expr = unwrapped;
+          continue;
+        }
+
         llvm_unreachable("other AutoClosureExpr must be handled specially");
       }
 

test/IDE/complete_ambiguous.swift

@@ -383,6 +383,10 @@ _ = testing([Point(4, 89)]) { arg in
 
 struct Thing {
     init(_ block: (Point) -> Void) {}
+
+    enum ThingEnum { case first, second }
+    func doStuff(_ x: ThingEnum, _ y: Int) -> Thing { return self }
+    func takesRef(_ ref: () -> ()) -> Thing { return self }
 }
 @resultBuilder
 struct ThingBuilder {
@@ -429,6 +433,20 @@ CreateThings {
     Thing. // ErrorExpr
 }
 
+struct TestFuncBodyBuilder {
+  func someFunc() {}
+
+  @ThingBuilder func foo() -> [Thing] {
+    Thing()
+      .doStuff(.#^FUNCBUILDER_FUNCBODY^#, 3)
+      .takesRef(someFunc)
+  }
+}
+// FUNCBUILDER_FUNCBODY: Begin completions, 3 items
+// FUNCBUILDER_FUNCBODY-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Identical]: first[#Thing.ThingEnum#];
+// FUNCBUILDER_FUNCBODY-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Identical]: second[#Thing.ThingEnum#];
+// FUNCBUILDER_FUNCBODY-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: hash({#(self): Thing.ThingEnum#})[#(into: inout Hasher) -> Void#];
+// FUNCBUILDER_FUNCBODY: End completions
 
 func takesClosureOfPoint(_: (Point)->()) {}
 func overloadedWithDefaulted(_: ()->()) {}

test/IDE/complete_subscript.swift

@@ -17,6 +17,7 @@
 
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=LABELED_SUBSCRIPT | %FileCheck %s -check-prefix=LABELED_SUBSCRIPT
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=TUPLE | %FileCheck %s -check-prefix=TUPLE
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=SETTABLE_SUBSCRIPT | %FileCheck %s -check-prefix=SETTABLE_SUBSCRIPT
 
 struct MyStruct<T> {
   static subscript(x: Int, static defValue: T) -> MyStruct<T> {
@@ -159,3 +160,20 @@ func testSubcscriptTuple(val: (x: Int, String)) {
 // TUPLE-DAG: Pattern/CurrNominal/Flair[ArgLabels]:                 ['[']{#keyPath: KeyPath<(x: Int, String), Value>#}[']'][#Value#];
 // TUPLE: End completions
 }
+
+struct HasSettableSub {
+    subscript(a: String) -> Any {
+        get { return 1 }
+        set { }
+    }
+}
+
+func testSettableSub(x: inout HasSettableSub) {
+    let local = "some string"
+    x[#^SETTABLE_SUBSCRIPT^#] = 32
+}
+// SETTABLE_SUBSCRIPT: Begin completions
+// SETTABLE_SUBSCRIPT-DAG: Pattern/CurrNominal/Flair[ArgLabels]: ['[']{#keyPath: KeyPath<HasSettableSub, Value>#}[']'][#Value#];
+// SETTABLE_SUBSCRIPT-DAG: Decl[Subscript]/CurrNominal/Flair[ArgLabels]: ['[']{#(a): String#}[']'][#@lvalue Any#];
+// SETTABLE_SUBSCRIPT-DAG: Decl[LocalVar]/Local/TypeRelation[Identical]: local[#String#]; name=local
+// SETTABLE_SUBSCRIPT: End completions