Merge pull request #29213 from varungandhi-apple/vg-fix-implicit-tupling-bug

We did the implicit untupling but forgot to do implicit tupling. Oops.

Author: varungandhi-apple

lib/Sema/TypeCheckPattern.cpp

@@ -839,9 +839,10 @@ namespace {
 //   1b. pat
 // type ~ ((T1, ..., Tn)) (n >= 2)
 //   2. pat ~ (P1, ..., Pm) (m >= 2)
-void implicitlyUntuplePatternIfApplicable(DiagnosticEngine &DE,
+void implicitlyUntuplePatternIfApplicable(ASTContext &Ctx,
                                           Pattern *&enumElementInnerPat,
                                           Type enumPayloadType) {
+  auto &DE = Ctx.Diags;
   if (auto *tupleType = dyn_cast<TupleType>(enumPayloadType.getPointer())) {
     if (tupleType->getNumElements() >= 2
         && enumElementInnerPat->getKind() == PatternKind::Paren) {
@@ -859,9 +860,14 @@ void implicitlyUntuplePatternIfApplicable(DiagnosticEngine &DE,
     }
   } else if (auto *tupleType = enumPayloadType->getAs<TupleType>()) {
     if (tupleType->getNumElements() >= 2
-        && enumElementInnerPat->getKind() == PatternKind::Tuple)
+        && enumElementInnerPat->getKind() == PatternKind::Tuple) {
       DE.diagnose(enumElementInnerPat->getLoc(),
                   diag::matching_many_patterns_with_tupled_assoc_value);
+      enumElementInnerPat =
+        new (Ctx) ParenPattern(enumElementInnerPat->getStartLoc(),
+                               enumElementInnerPat,
+                               enumElementInnerPat->getEndLoc());
+    }
   }
 }
 }
@@ -1406,7 +1412,7 @@ Pattern *TypeChecker::coercePatternToType(ContextualPattern pattern,
       newSubOptions.setContext(TypeResolverContext::EnumPatternPayload);
       newSubOptions |= TypeResolutionFlags::FromNonInferredPattern;
 
-      ::implicitlyUntuplePatternIfApplicable(Context.Diags, sub, elementType);
+      ::implicitlyUntuplePatternIfApplicable(Context, sub, elementType);
 
       sub = coercePatternToType(
           pattern.forSubPattern(sub, /*retainTopLevel=*/false), elementType,

test/Sema/exhaustive_switch.swift

@@ -1407,6 +1407,14 @@ enum SR11212Tests {
     }
   }
 
+  // rdar://problem/58578342
+  func sr11212_content_generic_pattern_untupled3(b: Box<((Int, Int), Int)>) -> (Int, Int, Int) {
+    switch b {
+    case let .box((x, y), z): return (x, y, z)
+    // expected-warning@-1 {{the enum case has a single tuple as an associated value, but there are several patterns here, implicitly tupling the patterns and trying to match that instead}}
+    }
+  }
+
   func sr11212_content_generic_pattern_ambiguous1(b: Box<(Int, Int)>) -> (Int, Int) {
     switch b {
     case .box(let b_): return b_