Merge pull request #61388 from xedin/support-closures-with-implicitly-wrapped-params

[CSClosure] Don't try to infer types for implicitly wrapped parameters

Author: xedin

lib/Sema/CSClosure.cpp

@@ -97,6 +97,13 @@ class TypeVariableRefFinder : public ASTWalker {
         return Action::Continue(expr);
 
       if (auto *wrappedVar = var->getOriginalWrappedProperty()) {
+        // If there is no type it means that the body of the
+        // closure hasn't been resolved yet, so we can
+        // just skip it and wait for \c applyPropertyWrapperToParameter
+        // to assign types.
+        if (wrappedVar->hasImplicitPropertyWrapper())
+          return Action::Continue(expr);
+
         auto outermostWrapperAttr =
             wrappedVar->getOutermostAttachedPropertyWrapper();
 

lib/Sema/CSGen.cpp

@@ -4516,13 +4516,15 @@ ConstraintSystem::applyPropertyWrapperToParameter(
       auto wrappedValueType = getType(param->getPropertyWrapperWrappedValueVar());
       addConstraint(ConstraintKind::PropertyWrapper, projectionType, wrappedValueType,
                     getConstraintLocator(param));
+      setType(param->getPropertyWrapperProjectionVar(), projectionType);
     }
 
     initKind = PropertyWrapperInitKind::ProjectedValue;
   } else {
     Type wrappedValueType = computeWrappedValueType(param, wrapperType);
     addConstraint(matchKind, paramType, wrappedValueType, locator);
     initKind = PropertyWrapperInitKind::WrappedValue;
+    setType(param->getPropertyWrapperWrappedValueVar(), wrappedValueType);
   }
 
   appliedPropertyWrappers[anchor].push_back({ wrapperType, initKind });

validation-test/Sema/SwiftUI/builder_with_implicit_property_wrapper_inference.swift

@@ -0,0 +1,29 @@
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5
+
+// REQUIRES: objc_interop
+// REQUIRES: OS=macosx
+
+import SwiftUI
+
+struct Example: View {
+  struct Item: Identifiable {
+    var id: Int
+    var title: String
+    var isOn: Bool = .random()
+  }
+
+  @State var items = [
+    Item(id: 0, title: "")
+  ]
+
+  var body: some View {
+    List {
+      Section {
+        ForEach($items) { $item in
+          Toggle(item.title, isOn: $item.isOn.animation())
+        }
+        .onDelete { items.remove(atOffsets: $0) }
+      }
+    }
+  }
+}