ASTPrinter: Print shape requirements in a way that parses

Author: slavapestov

lib/AST/ASTPrinter.cpp

@@ -1787,22 +1787,26 @@ void PrintAST::printSingleDepthOfGenericSignature(
 }
 
 void PrintAST::printRequirement(const Requirement &req) {
-  printTransformedType(req.getFirstType());
   switch (req.getKind()) {
   case RequirementKind::SameShape:
-    Printer << ".shape == ";
+    Printer << "((";
+    printTransformedType(req.getFirstType());
+    Printer << ", ";
     printTransformedType(req.getSecondType());
-    Printer << ".shape";
+    Printer << ")...) : Any";
     return;
   case RequirementKind::Layout:
+    printTransformedType(req.getFirstType());
     Printer << " : ";
     req.getLayoutConstraint()->print(Printer, Options);
     return;
   case RequirementKind::Conformance:
   case RequirementKind::Superclass:
+    printTransformedType(req.getFirstType());
     Printer << " : ";
     break;
   case RequirementKind::SameType:
+    printTransformedType(req.getFirstType());
     Printer << " == ";
     break;
   }

test/Generics/pack-shape-requirements.swift

@@ -7,42 +7,42 @@ protocol P {
 }
 
 // CHECK-LABEL: inferSameShape(ts:us:)
-// CHECK-NEXT: Generic signature: <T..., U... where T.shape == U.shape>
+// CHECK-NEXT: Generic signature: <T..., U... where ((T, U)...) : Any>
 func inferSameShape<T..., U...>(ts t: T..., us u: U...) where ((T, U)...): Any {
 }
 
 // CHECK-LABEL: desugarSameShape(ts:us:)
-// CHECK-NEXT: Generic signature: <T..., U... where T : P, T.shape == U.shape, U : P>
+// CHECK-NEXT: Generic signature: <T..., U... where T : P, ((T, U)...) : Any, U : P>
 func desugarSameShape<T..., U...>(ts t: T..., us u: U...) where T: P, U: P, ((T.A, U.A)...): Any {
 }
 
 // CHECK-LABEL: multipleSameShape1(ts:us:vs:)
-// CHECK-NEXT: Generic signature: <T..., U..., V... where T.shape == U.shape, U.shape == V.shape>
+// CHECK-NEXT: Generic signature: <T..., U..., V... where ((T, U)...) : Any, ((U, V)...) : Any>
 func multipleSameShape1<T..., U..., V...>(ts t: T..., us u: U..., vs v: V...) where ((T, U, V)...): Any {
 }
 
 // CHECK-LABEL: multipleSameShape2(ts:us:vs:)
-// CHECK-NEXT: Generic signature: <T..., U..., V... where T.shape == U.shape, U.shape == V.shape>
+// CHECK-NEXT: Generic signature: <T..., U..., V... where ((T, U)...) : Any, ((U, V)...) : Any>
 func multipleSameShape2<T..., U..., V...>(ts t: T..., us u: U..., vs v: V...) where ((V, T, U)...): Any {
 }
 
 // CHECK-LABEL: multipleSameShape3(ts:us:vs:)
-// CHECK-NEXT: Generic signature: <T..., U..., V... where T.shape == U.shape, U.shape == V.shape>
+// CHECK-NEXT: Generic signature: <T..., U..., V... where ((T, U)...) : Any, ((U, V)...) : Any>
 func multipleSameShape3<T..., U..., V...>(ts t: T..., us u: U..., vs v: V...) where ((U, V, T)...): Any {
 }
 
 // CHECK-LABEL: multipleSameShape4(ts:us:vs:)
-// CHECK-NEXT: Generic signature: <T..., U..., V... where T.shape == U.shape, U.shape == V.shape>
+// CHECK-NEXT: Generic signature: <T..., U..., V... where ((T, U)...) : Any, ((U, V)...) : Any>
 func multipleSameShape4<T..., U..., V...>(ts t: T..., us u: U..., vs v: V...) where ((U, T, V)...): Any {
 }
 
 // CHECK-LABEL: multipleSameShape5(ts:us:vs:)
-// CHECK-NEXT: Generic signature: <T..., U..., V... where T.shape == U.shape, U.shape == V.shape>
+// CHECK-NEXT: Generic signature: <T..., U..., V... where ((T, U)...) : Any, ((U, V)...) : Any>
 func multipleSameShape5<T..., U..., V...>(ts t: T..., us u: U..., vs v: V...) where ((T, V, U)...): Any {
 }
 
 // CHECK-LABEL: multipleSameShape6(ts:us:vs:)
-// CHECK-NEXT: Generic signature: <T..., U..., V... where T.shape == U.shape, U.shape == V.shape>
+// CHECK-NEXT: Generic signature: <T..., U..., V... where ((T, U)...) : Any, ((U, V)...) : Any>
 func multipleSameShape6<T..., U..., V...>(ts t: T..., us u: U..., vs v: V...) where ((V, U, T)...): Any {
 }
 
@@ -55,15 +55,15 @@ struct Ts<T...> {
 
     struct Vs<V...> {
       // CHECK-LABEL: Ts.Us.Vs.packEquality()
-      // CHECK-NEXT: Generic signature: <T..., U..., V... where T == U, T.shape == V.shape>
+      // CHECK-NEXT: Generic signature: <T..., U..., V... where T == U, ((T, V)...) : Any>
       func packEquality() where T == U, ((U, V)...): Any {
       }
     }
   }
 }
 
 // CHECK-LABEL: expandedParameters(_:transform:)
-// CHECK-NEXT: Generic signature: <T..., Result... where T.shape == Result.shape>
+// CHECK-NEXT: Generic signature: <T..., Result... where ((T, Result)...) : Any>
 func expandedParameters<T..., Result...>(_ t: T..., transform: ((T) -> Result)...) -> (Result...) {
   fatalError()
 }

test/ModuleInterface/pack_expansion_type.swift

@@ -0,0 +1,13 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-module-interface(%t/PackExpansionType.swiftinterface) %s -module-name PackExpansionType -enable-experimental-feature VariadicGenerics
+// RUN: %FileCheck %s < %t/PackExpansionType.swiftinterface
+
+// CHECK: public func variadicFunction<T..., U...>(t: T..., u: U...) -> ((T, U)...) where ((T, U)...) : Any
+public func variadicFunction<T..., U...>(t: T..., u: U...) -> ((T, U)...) {}
+
+// CHECK: public struct VariadicType<T...> {
+public struct VariadicType<T...> {
+  // CHECK: public func variadicMethod<U...>(t: T..., u: U...) -> ((T, U)...) where ((T, U)...) : Any
+  public func variadicMethod<U...>(t: T..., u: U...) -> ((T, U)...) {}
+}
+// CHECK: }