Merge pull request #40438 from xedin/rdar-85843677

[PreCheck] Don't use value declared in closure as outer candidate if …

Author: xedin

lib/Sema/PreCheckExpr.cpp

@@ -749,10 +749,27 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
                                            /*Implicit=*/true);
     }
 
+    auto isInClosureContext = [&](ValueDecl *decl) -> bool {
+      auto *DC = decl->getDeclContext();
+      do {
+        if (dyn_cast<ClosureExpr>(DC))
+          return true;
+      } while ((DC = DC->getParent()));
+
+      return false;
+    };
+
     llvm::SmallVector<ValueDecl *, 4> outerAlternatives;
     (void)findNonMembers(Lookup.outerResults(), UDRE->getRefKind(),
                          /*breakOnMember=*/false, outerAlternatives,
-                         /*isValid=*/[](ValueDecl *choice) -> bool {
+                         /*isValid=*/[&](ValueDecl *choice) -> bool {
+                           // Values that are defined in a closure
+                           // that hasn't been type-checked yet,
+                           // cannot be outer candidates.
+                           if (isInClosureContext(choice)) {
+                             return choice->hasInterfaceType() &&
+                                    !choice->isInvalid();
+                           }
                            return !choice->isInvalid();
                          });
 

validation-test/Sema/type_checker_crashers_fixed/rdar85843677.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -swift-version 5 -experimental-multi-statement-closures
 
 func callClosure(closure: () -> ()) {  
   closure()