Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

include/swift/Sema/ConstraintSystem.h

@@ -1735,9 +1735,9 @@ class SolutionApplicationTarget {
   }
 
   static SolutionApplicationTarget
-  forUninitializedVar(PatternBindingDecl *binding, unsigned index, Pattern *var,
+  forUninitializedVar(PatternBindingDecl *binding, unsigned index,
                       Type patternTy) {
-    return {binding, index, var, patternTy};
+    return {binding, index, binding->getPattern(index), patternTy};
   }
 
   /// Form a target for a synthesized property wrapper initializer.

lib/Sema/CSGen.cpp

@@ -3926,10 +3926,13 @@ bool ConstraintSystem::generateConstraints(
       if (!pattern)
         return true;
 
-      // Type check the pattern. Note use of `forRawPattern` here instead
-      // of `forPatternBindingDecl` because resolved `pattern` is not
-      // associated with `patternBinding`.
-      auto contextualPattern = ContextualPattern::forRawPattern(pattern, dc);
+      // Reset binding to point to the resolved pattern. This is required
+      // before calling `forPatternBindingDecl`.
+      patternBinding->setPattern(index, pattern,
+                                 patternBinding->getInitContext(index));
+
+      auto contextualPattern =
+          ContextualPattern::forPatternBindingDecl(patternBinding, index);
       Type patternType = TypeChecker::typeCheckPattern(contextualPattern);
 
       // Fail early if pattern couldn't be type-checked.
@@ -3944,10 +3947,10 @@ bool ConstraintSystem::generateConstraints(
 
       auto init = patternBinding->getInit(index);
       auto target = init ? SolutionApplicationTarget::forInitialization(
-                               init, dc, patternType, pattern,
+                               init, dc, patternType, patternBinding, index,
                                /*bindPatternVarsOneWay=*/true)
                          : SolutionApplicationTarget::forUninitializedVar(
-                               patternBinding, index, pattern, patternType);
+                               patternBinding, index, patternType);
 
       if (generateConstraints(target, FreeTypeVariableBinding::Disallow)) {
         hadError = true;

validation-test/Sema/type_checker_crashers_fixed/sr14893.swift

@@ -23,7 +23,7 @@ struct Image : View {
 
 struct MyView {
   @ViewBuilder var body: some View {
-    let icon: Category! = Category.first // expected-error {{using '!' is not allowed here; perhaps '?' was intended?}} {{23-24=?}}
+    let icon: Category! = Category.first // Ok
     Image().test(icon)
   }
 }