Test reconstruction of non-generic nested types with contextual where clauses

Author: AnthonyLatsis

test/TypeDecoder/generic_typealias.swift

@@ -20,9 +20,11 @@ struct Outer {
 
 struct GenericOuter<T> {
   typealias Alias<T> = Int
+  typealias AliasWhere = Int where T == GenericOuter<Never>
 
   struct Inner {
     typealias Alias<T> = Int
+    typealias AliasWhere = Int where T: Equatable
   }
 }
 
@@ -32,6 +34,7 @@ protocol Proto {
 
 extension Proto {
   typealias OtherAlias<T> = Int
+  typealias OtherAliasWhere = Int where Self == Conforms
 }
 
 extension GenericOuter where T : Proto {
@@ -90,16 +93,22 @@ do {
 // CHECK-TYPE: Outer.Inner.Alias<String>
 
 // DEMANGLE-TYPE: $s17generic_typealias12GenericOuterV5AliasaySi_SSGD
+// DEMANGLE-TYPE: $s17generic_typealias12GenericOuterV10AliasWhereayACys5NeverOG_GD
 // DEMANGLE-TYPE: $s17generic_typealias12GenericOuterV5InnerV5AliasaySi__SSGD
+// DEMANGLE-TYPE: $s17generic_typealias12GenericOuterV5InnerV10AliasWhereaySi__GD
 
 // CHECK-TYPE: GenericOuter<Int>.Alias<String>
+// CHECK-TYPE: GenericOuter<GenericOuter<Never>>.AliasWhere
 // CHECK-TYPE: GenericOuter<Int>.Inner.Alias<String>
+// CHECK-TYPE: GenericOuter<Int>.Inner.AliasWhere
 
 // DEMANGLE-TYPE: $s17generic_typealias5ProtoP5AliasayAA8ConformsV_SSGD
 // DEMANGLE-TYPE: $s17generic_typealias5ProtoPAAE10OtherAliasayAA8ConformsV_SSGD
+// DEMANGLE-TYPE: $s17generic_typealias5ProtoPAAE15OtherAliasWhereayAA8ConformsV_GD
 
 // CHECK-TYPE: Conforms.Alias<String>
 // CHECK-TYPE: Conforms.OtherAlias<String>
+// CHECK-TYPE: Conforms.OtherAliasWhere
 
 // DEMANGLE-TYPE: $s17generic_typealias5ProtoP5Aliasayx_SSGD
 // DEMANGLE-TYPE: $s17generic_typealias5ProtoPAAE10OtherAliasayx_SSGD
@@ -116,16 +125,22 @@ do {
 // DEMANGLE-DECL: $s17generic_typealias5OuterV5Aliasa
 // DEMANGLE-DECL: $s17generic_typealias5OuterV5InnerV5Aliasa
 // DEMANGLE-DECL: $s17generic_typealias12GenericOuterV5Aliasa
+// DEMANGLE-DECL: $s17generic_typealias12GenericOuterV10AliasWherea
 // DEMANGLE-DECL: $s17generic_typealias12GenericOuterV5InnerV5Aliasa
+// DEMANGLE-DECL: $s17generic_typealias12GenericOuterV5InnerV10AliasWherea
 // DEMANGLE-DECL: $s17generic_typealias5ProtoP5Aliasa
 // DEMANGLE-DECL: $s17generic_typealias5ProtoPAAE10OtherAliasa
+// DEMANGLE-DECL: $s17generic_typealias5ProtoPAAE15OtherAliasWherea
 // DEMANGLE-DECL: $s17generic_typealias12GenericOuterVA2A5ProtoRzlE16ConditionalAliasa
 
 // CHECK-DECL: generic_typealias.(file).Alias
 // CHECK-DECL: generic_typealias.(file).Outer.Alias
 // CHECK-DECL: generic_typealias.(file).Outer.Inner.Alias
 // CHECK-DECL: generic_typealias.(file).GenericOuter.Alias
+// CHECK-DECL: generic_typealias.(file).GenericOuter.AliasWhere
 // CHECK-DECL: generic_typealias.(file).GenericOuter.Inner.Alias
+// CHECK-DECL: generic_typealias.(file).GenericOuter.Inner.AliasWhere
 // CHECK-DECL: generic_typealias.(file).Proto.Alias
 // CHECK-DECL: generic_typealias.(file).Proto extension.OtherAlias
+// CHECK-DECL: generic_typealias.(file).Proto extension.OtherAliasWhere
 // CHECK-DECL: generic_typealias.(file).GenericOuter extension.ConditionalAlias

test/TypeDecoder/nominal_types.swift

@@ -25,6 +25,7 @@ enum GenericOuter<T, U> {
 
   struct Inner {}
   struct GenericInner<T, U> {}
+  struct InnerWhere where T == GenericOuter<U, U> {}
 }
 
 func blackHole(_: Any...) {}
@@ -59,6 +60,7 @@ enum STSContainer<T : STSTagProtocol> {
   class Superclass {}
   class Subclass<U>: Superclass where T == STSOuter {
     class ExtraNested: Superclass {}
+    class ExtraNestedWhere: Superclass where U: Subclass<T> {}
   }
 
   class GenericSuperclass<U> {}
@@ -122,13 +124,17 @@ extension STSContainer℠ where T == STSOuter {
 
 // DEMANGLE-TYPE: $s13nominal_types12GenericOuterO5InnerVyxq__GD
 // DEMANGLE-TYPE: $s13nominal_types12GenericOuterO0C5InnerVyxq__qd__qd_0_GD
+// DEMANGLE-TYPE: $s13nominal_types12GenericOuterO10InnerWhereVyACyq_q_Gq__GD
 // CHECK-TYPE: GenericOuter<τ_0_0, τ_0_1>.Inner
 // CHECK-TYPE: GenericOuter<τ_0_0, τ_0_1>.GenericInner<τ_1_0, τ_1_1>
+// CHECK-TYPE: GenericOuter<GenericOuter<τ_0_1, τ_0_1>, τ_0_1>.InnerWhere
 
 // DEMANGLE-TYPE: $s13nominal_types12GenericOuterO5InnerVySiSS_GD
 // DEMANGLE-TYPE: $s13nominal_types12GenericOuterO0C5InnerVySiSS_SfSdGD
+// DEMANGLE-TYPE: $s13nominal_types12GenericOuterO10InnerWhereVyACyS2bGSb_GD
 // CHECK-TYPE: GenericOuter<Int, String>.Inner
 // CHECK-TYPE: GenericOuter<Int, String>.GenericInner<Float, Double>
+// CHECK-TYPE: GenericOuter<GenericOuter<Bool, Bool>, Bool>.InnerWhere
 
 // DEMANGLE-TYPE: $s13nominal_types12GenericOuterOyxq_GD
 // DEMANGLE-TYPE: $s13nominal_types12GenericOuterOySiSSGD
@@ -153,6 +159,8 @@ extension STSContainer℠ where T == STSOuter {
 
 // DEMANGLE-TYPE: $s13nominal_types12STSContainerO8SubclassC11ExtraNestedCyAA8STSOuterV_Si_G
 // CHECK-TYPE: STSContainer<STSOuter>.Subclass<Int>.ExtraNested
+// DEMANGLE-TYPE: $s13nominal_types12STSContainerO8SubclassC16ExtraNestedWhereCyAA8STSOuterV_AEyAI_AIG_G
+// CHECK-TYPE: STSContainer<STSOuter>.Subclass<STSContainer<STSOuter>.Subclass<STSOuter>>.ExtraNestedWhere
 // DEMANGLE-TYPE: $s13nominal_types0017STSContainer_swCgOA2A8STSOuterVRszrlE8SubclassC11ExtraNestedCyAE_Si_G
 // CHECK-TYPE: STSContainer℠<STSOuter>.Subclass<Int>.ExtraNested
 
@@ -177,6 +185,7 @@ extension STSContainer℠ where T == STSOuter {
 // DEMANGLE-DECL: $s13nominal_types12GenericOuterO
 // DEMANGLE-DECL: $s13nominal_types12GenericOuterO5InnerV
 // DEMANGLE-DECL: $s13nominal_types12GenericOuterO0C5InnerV
+// DEMANGLE-DECL: $s13nominal_types12GenericOuterO10InnerWhereV
 // DEMANGLE-DECL: $s13nominal_types1PP
 // DEMANGLE-DECL: $s13nominal_types11ConstrainedV
 
@@ -186,5 +195,6 @@ extension STSContainer℠ where T == STSOuter {
 // CHECK-DECL: nominal_types.(file).GenericOuter
 // CHECK-DECL: nominal_types.(file).GenericOuter.Inner
 // CHECK-DECL: nominal_types.(file).GenericOuter.GenericInner
+// CHECK-DECL: nominal_types.(file).GenericOuter.InnerWhere
 // CHECK-DECL: nominal_types.(file).P
 // CHECK-DECL: nominal_types.(file).Constrained