Merge pull request #84209 from slavapestov/fix-rdar159790557

RequirementMachine: Fix crash-on-invalid with concrete type requirements involving packs

Author: slavapestov

include/swift/AST/DiagnosticsSema.def

@@ -3421,6 +3421,9 @@ ERROR(invalid_shape_requirement,none,
 ERROR(unsupported_same_element,none,
       "same-element requirements are not yet supported",
       ())
+ERROR(unsupported_pack_same_type,none,
+      "same-type requirements between packs and concrete types are not yet supported",
+      ())
 
 ERROR(requires_generic_params_made_equal,none,
       "same-type requirement makes generic parameters %0 and %1 equivalent",

lib/AST/RequirementMachine/Diagnostics.cpp

@@ -226,6 +226,15 @@ bool swift::rewriting::diagnoseRequirementErrors(
       break;
     }
 
+    case RequirementError::Kind::UnsupportedPackSameType: {
+      if (error.getRequirement().hasError())
+        break;
+
+      ctx.Diags.diagnose(loc, diag::unsupported_pack_same_type);
+      diagnosedError = true;
+      break;
+    }
+
     case RequirementError::Kind::InvalidValueGenericType: {
       auto req = error.getRequirement();
 

lib/AST/RequirementMachine/Diagnostics.h

@@ -53,6 +53,9 @@ struct RequirementError {
     RecursiveRequirement,
     /// A not-yet-supported same-element requirement, e.g. each T == Int.
     UnsupportedSameElement,
+    /// A not-yet-supported same-type requirement involving packs and concrete
+    /// types, e.g. (repeat each T) == (Int, repeat each U).
+    UnsupportedPackSameType,
     /// An unexpected value type used in a value generic,
     /// e.g. 'let N: String'.
     InvalidValueGenericType,
@@ -162,6 +165,10 @@ struct RequirementError {
     return {Kind::UnsupportedSameElement, req, loc};
   }
 
+  static RequirementError forPackSameType(Requirement req, SourceLoc loc) {
+    return {Kind::UnsupportedPackSameType, req, loc};
+  }
+
   static RequirementError forInvalidValueGenericType(Type subjectType,
                                                      Type constraint,
                                                      SourceLoc loc) {

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -222,17 +222,15 @@ static void desugarSameTypeRequirement(
         break;
       }
 
-      auto &ctx = firstType->getASTContext();
-      if (!ctx.LangOpts.hasFeature(Feature::SameElementRequirements)) {
-        // If one side is a parameter pack, this is a same-element requirement, which
-        // is not yet supported.
-        if (firstType->isParameterPack() != secondType->isParameterPack()) {
-          errors.push_back(RequirementError::forSameElement(
-              {kind, sugaredFirstType, secondType}, loc));
-          return true;
-        }
+      if (firstType->is<PackExpansionType>() ||
+          secondType->is<PackExpansionType>()) {
+        errors.push_back(RequirementError::forPackSameType(
+            {kind, sugaredFirstType, secondType}, loc));
+        return true;
       }
 
+      auto &ctx = firstType->getASTContext();
+
       if (firstType->isValueParameter() || secondType->isValueParameter()) {
         // FIXME: If we ever support other value types in the future besides
         // 'Int', then we'd want to check their underlying value type to ensure
@@ -265,16 +263,38 @@ static void desugarSameTypeRequirement(
       }
 
       if (firstType->isTypeParameter() && secondType->isTypeParameter()) {
+        if (!ctx.LangOpts.hasFeature(Feature::SameElementRequirements)) {
+          // If one side is a parameter pack, this is a same-element requirement, which
+          // is not yet supported.
+          if (firstType->isParameterPack() != secondType->isParameterPack()) {
+            errors.push_back(RequirementError::forSameElement(
+                {kind, sugaredFirstType, secondType}, loc));
+            return true;
+          }
+        }
+
         result.emplace_back(kind, sugaredFirstType, secondType);
         return true;
       }
 
       if (firstType->isTypeParameter()) {
+        if (firstType->isParameterPack()) {
+          errors.push_back(RequirementError::forPackSameType(
+              {kind, sugaredFirstType, secondType}, loc));
+          return true;
+        }
+
         result.emplace_back(kind, sugaredFirstType, secondType);
         return true;
       }
 
       if (secondType->isTypeParameter()) {
+        if (secondType->isParameterPack()) {
+          errors.push_back(RequirementError::forPackSameType(
+              {kind, sugaredFirstType, secondType}, loc));
+          return true;
+        }
+
         result.emplace_back(kind, secondType, sugaredFirstType);
         return true;
       }

test/ASTGen/diagnostics.swift

@@ -44,7 +44,7 @@ struct S {
 }
 
 struct ExpansionRequirementTest<each T> {}
-extension ExpansionRequirementTest where repeat each T == Int {} // expected-error {{same-element requirements are not yet supported}}
+extension ExpansionRequirementTest where repeat each T == Int {} // expected-error {{same-type requirements between packs and concrete types are not yet supported}}
 
 
 #warning("this is a warning") // expected-warning {{this is a warning}}

test/Generics/pack_same_type_requirements.swift

@@ -0,0 +1,25 @@
+// RUN: %target-typecheck-verify-swift
+
+protocol PipelineItem {
+    associatedtype Input
+    associatedtype Output
+}
+
+// This example will never work; eventually, it will produce a more precise diagnostic.
+func bad<First : PipelineItem,
+         each T : PipelineItem,
+         Last : PipelineItem>(_ first: First, _ rest: repeat each T, last: Last)
+    where (First.Output, repeat (each T).Output) == (repeat (each T).Input, Last.Input) {}
+    // expected-error@-1 2{{same-type requirements between packs and concrete types are not yet supported}}
+
+// This is also invalid.
+func bad2<First : PipelineItem,
+          each T : PipelineItem>(_ first: First, _ rest: repeat each T)
+    where repeat (each T).Output == (First, repeat (each T).Input) {}
+    // expected-error@-1 {{same-type requirements between packs and concrete types are not yet supported}}
+
+// This could eventually be made to work.
+func good<First : PipelineItem,
+          each T : PipelineItem>(_ first: First, _ rest: repeat each T)
+    where (repeat (each T).Output) == (First, repeat (each T).Input) {}
+    // expected-error@-1 {{generic signature requires types '(repeat (each T).Output)' and '(First, repeat (each T).Input)' to be the same}}

test/Generics/variadic_generic_types.swift

@@ -125,7 +125,7 @@ struct WithPack<each T> {}
 // FIXME: The diagnostics are misleading.
 
 extension WithPack<Int, Int> {}
-// expected-error@-1 {{same-element requirements are not yet supported}}
+// expected-error@-1 {{same-type requirements between packs and concrete types are not yet supported}}
 
 extension WithPack where (repeat each T) == (Int, Int) {}
 // expected-error@-1 {{generic signature requires types '(repeat each T)' and '(Int, Int)' to be the same}}