AST: Correct '(each T).A' output for archetypes

isParameterPack() is always false for an archetype; we must test for a
PackArchetypeType here instead.

Author: slavapestov

lib/AST/ASTPrinter.cpp

@@ -6244,7 +6244,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       if (param->isParameterPack())
         return false;
     } else if (auto archetype = dyn_cast<ArchetypeType>(T.getPointer())) {
-      if (archetype->isParameterPack())
+      if (isa<PackArchetypeType>(archetype))
         return false;
       if (Options.PrintForSIL && isa<LocalArchetypeType>(archetype))
         return false;

test/Constraints/pack-expansion-expressions.swift

@@ -74,7 +74,7 @@ func forEachEach<each C, U>(c: repeat each C, function: (U) -> Void)
     // expected-error@-1{{same-element requirements are not yet supported}}
 
   _ = (repeat (each c).forEach(function))
-  // expected-error@-1 {{cannot convert value of type '(U) -> Void' to expected argument type '(each C.Element) throws -> Void'}}
+  // expected-error@-1 {{cannot convert value of type '(U) -> Void' to expected argument type '((each C).Element) throws -> Void'}}
 }
 
 func typeReprPacks<each T: ExpressibleByIntegerLiteral>(_ t: repeat each T) {

test/IRGen/variadic_generic_functions.sil

@@ -70,8 +70,8 @@ sil @fc : $<each T : P> () -> () {}
 // CHECK-SAME:        [[INT]] %0,
 // CHECK-SAME:        ptr %"each T",
 // CHECK-SAME:        ptr %"each T.PA",
-// CHECK-SAME:        ptr %"each T.A.P")
-// CHECK:         call swiftcc void @f1c([[INT]] %0, ptr %"each T", ptr %"each T.PA", ptr %"each T.A.P")
+// CHECK-SAME:        ptr %"(each T).A.P")
+// CHECK:         call swiftcc void @f1c([[INT]] %0, ptr %"each T", ptr %"each T.PA", ptr %"(each T).A.P")
 sil @f1 : $<each T : PA where repeat (each T).A : P> () -> () {
     %f1c = function_ref @f1c : $@convention(thin) <each T : PA where repeat (each T).A : P> () -> ()
     apply %f1c<Pack{repeat each T}>() : $@convention(thin) <each T : PA where repeat (each T).A : P> () -> ()
@@ -105,7 +105,7 @@ sil @associatedtype_with_added_conformance_callee : $<each T : Q> () -> () {}
 // CHECK-SAME:        [[INT]] [[SHAPE:%[^,]+]],
 // CHECK-SAME:        ptr %"each T",
 // CHECK-SAME:        ptr %"each T.PA",
-// CHECK-SAME:        ptr %"each T.A.QA",
+// CHECK-SAME:        ptr %"(each T).A.QA",
 // CHECK-SAME:        ptr [[ASSOCIATEDTYPES_CONFORMANCES_TO_Q:%[^,]+]])
 // CHECK:         [[ASSOCIATEDTYPES:%[^,]+]] = alloca ptr, [[INT]] [[SHAPE]]
 // CHECK:         call swiftcc void @associatedtype_with_added_conformance_2_callee(
@@ -147,15 +147,15 @@ sil @associatedtype_with_forwarded_conformance_1_callee : $<each T : Q> () -> ()
 // CHECK-SAME:        [[INT]] [[SHAPE:%[^,]+]],
 // CHECK-SAME:        ptr %"each T",
 // CHECK-SAME:        ptr %"each T.PA",
-// CHECK-SAME:        ptr %"each T.A.Q")
+// CHECK-SAME:        ptr %"(each T).A.Q")
 // CHECK:         [[GEN1_TYPES:%[^,]+]] = alloca ptr, [[INT]] [[SHAPE]]
 // CHECK:         [[STORED_STACK_LOC:%[^,]+]] = call ptr @llvm.stacksave()
 // CHECK:         [[GEN1_CONFORMANCES_TO_PA:%[^,]+]] = alloca ptr, [[INT]] [[SHAPE]]
 // CHECK:         call swiftcc void @generictype_with_forwarded_conformance_2_callee(
 // CHECK-SAME:        [[INT]] [[SHAPE]],
 // CHECK-SAME:        ptr [[GEN1_TYPES]],
 // CHECK-SAME:        ptr [[GEN1_CONFORMANCES_TO_PA]],
-// CHECK-SAME:        ptr %"each T.A.Q")
+// CHECK-SAME:        ptr %"(each T).A.Q")
 // CHECK:         call void @llvm.stackrestore(ptr [[STORED_STACK_LOC]])
 sil @generictype_with_forwarded_conformance_2 : $<each T : PA where repeat (each T).A : Q>() -> () {
     %callee = function_ref @generictype_with_forwarded_conformance_2_callee : $@convention(thin) <each T : PA where repeat (each T).A : Q> () -> ()
@@ -170,15 +170,15 @@ sil @generictype_with_forwarded_conformance_2_callee : $<each T : PA where repea
 // CHECK-SAME:        [[INT]] [[SHAPE:%[^,]+]],
 // CHECK-SAME:        ptr %"each T",
 // CHECK-SAME:        ptr %"each T.PA",
-// CHECK-SAME:        ptr %"each T.A.Q")
+// CHECK-SAME:        ptr %"(each T).A.Q")
 // CHECK:         [[GEN1_GEN1_TYPES:%[^,]+]] = alloca ptr, [[INT]] [[SHAPE]]
 // CHECK:         [[STORED_STACK_LOC:%[^,]+]] = call ptr @llvm.stacksave()
 // CHECK:         [[GEN1_GEN1_CONFORMANCES_TO_PA:%[^,]+]] = alloca ptr, [[INT]] [[SHAPE]]
 // CHECK:         call swiftcc void @generic_with_forwarded_conformance_3_callee(
 // CHECK-SAME:        [[INT]] [[SHAPE]],
 // CHECK-SAME:        ptr [[GEN1_GEN1_TYPES]],
 // CHECK-SAME:        ptr [[GEN1_GEN1_CONFORMANCES_TO_PA]],
-// CHECK-SAME:        ptr %"each T.A.Q")
+// CHECK-SAME:        ptr %"(each T).A.Q")
 // CHECK:         call void @llvm.stackrestore(ptr [[STORED_STACK_LOC]])
 sil @generic_with_forwarded_conformance_3 : $<each T : PA where repeat (each T).A : Q> () -> () {
     %callee = function_ref @generic_with_forwarded_conformance_3_callee : $@convention(thin) <each T : PA where repeat (each T).A : Q> () -> ()

test/SILGen/variadic-generic-tuples.swift

@@ -358,8 +358,8 @@ func testStructOfLoadableTuple() -> StructOfLoadableTuple<Int> {
 //   The verifier had some home-grown type-lowering logic that didn't
 //   know about pack expansions.
 // CHECK-LABEL: sil {{.*}}@$s4main22testExistentialErasureyyxxQpRvzlF1gL_yyqd__qd__QpRvzRvd__r__lF :
-// CHECK:         [[T0:%.*]] = init_existential_addr {{.*}} : $*Any, $(repeat each T.Type)
-// CHECK:         tuple_pack_element_addr {{.*}} of [[T0]] : $*(repeat @thick each T.Type) as $*@thick (@pack_element("{{.*}}") each T).Type
+// CHECK:         [[T0:%.*]] = init_existential_addr {{.*}} : $*Any, $(repeat (each T).Type)
+// CHECK:         tuple_pack_element_addr {{.*}} of [[T0]] : $*(repeat @thick (each T).Type) as $*@thick (@pack_element("{{.*}}") each T).Type
 func testExistentialErasure<each T>(_: repeat each T) {
   func g<each U>(_: repeat each U) {
     print((repeat (each T).self))