Merge pull request #39020 from xedin/fix-decls-with-multiple-patterns

[ResultBuilders] Fix handling of multiple pattern bindings

Author: xedin

include/swift/Sema/ConstraintSystem.h

@@ -996,7 +996,7 @@ class SolutionApplicationTargetsKey {
 
   SolutionApplicationTargetsKey(
       const PatternBindingDecl *patternBinding, unsigned index) {
-    kind = Kind::stmt;
+    kind = Kind::patternBindingEntry;
     storage.patternBindingEntry.patternBinding = patternBinding;
     storage.patternBindingEntry.index = index;
   }

test/Constraints/result_builder_diags.swift

@@ -111,6 +111,13 @@ func testDiags() {
     y + 25
   }
 
+  tuplify(true) { _ in
+    0
+    let x: Int = 0, y: String = "" // Multiple initialized pattern bindings are okay
+    x + 1
+    y
+  }
+
   // Statements unsupported by the particular builder.
   tuplifyWithoutIf(true) {
     if $0 {    // expected-error{{closure containing control flow statement cannot be used with result builder 'TupleBuilderWithoutIf'}}