RequirementMachine: Update tests for change in -dump-requirement-machine output

Author: slavapestov

test/Generics/generic_objc_superclass.swift

@@ -16,6 +16,8 @@ func foo<T : Generic<U>, U>(_: T, _: U) {
 // CHECK-NEXT: - τ_0_0.[superclass: Generic<τ_0_0> with <τ_0_1>] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[layout: AnyObject] => τ_0_0
 // CHECK-NEXT: }
+// CHECK-NEXT: Homotopy generators: {
+// CHECK-NEXT: }
 // CHECK-NEXT: Property map: {
 // CHECK-NEXT:   τ_0_0 => { layout: AnyObject superclass: [superclass: Generic<τ_0_0> with <τ_0_1>] }
 // CHECK-NEXT: }

test/Generics/rdar79564324.swift

@@ -33,6 +33,8 @@ public func test<T : P>(_ t: T) where T == T.A {
 // CHECK-NEXT: - τ_0_1.A => τ_0_0
 // CHECK-NEXT: - τ_0_0.A => τ_0_0
 // CHECK-NEXT: }
+// CHECK-NEXT: Homotopy generators: {
+// CHECK:      }
 // CHECK-NEXT: Property map: {
 // CHECK-NEXT:   [P:A] => { conforms_to: [P] }
 // CHECK-NEXT:   τ_0_1 => { conforms_to: [P] }

test/Generics/unify_associated_types.swift

@@ -22,11 +22,13 @@ struct MergeTest<G : P1a & P2a> {}
 
 // CHECK-LABEL: Adding generic signature <τ_0_0 where τ_0_0 : P1a, τ_0_0 : P2a> {
 // CHECK-LABEL: Rewrite system: {
-// CHECK: - τ_0_0.[P2a:T] => τ_0_0.[P1a&P2a:T]
 // CHECK: - τ_0_0.[P1a:T] => τ_0_0.[P1a&P2a:T]
-// CHECK: - [P1a&P2a:T].[P2:X] => [P1a&P2a:T].[P1&P2:X]
+// CHECK: - τ_0_0.[P2a:T] => τ_0_0.[P1a&P2a:T]
 // CHECK: - τ_0_0.[P1a&P2a:T].[P1:X] => τ_0_0.[P1a&P2a:T].[P1&P2:X]
 // CHECK: - [P1a&P2a:T].[P1:X] => [P1a&P2a:T].[P1&P2:X]
+// CHECK: - [P1a&P2a:T].[P2:X] => [P1a&P2a:T].[P1&P2:X]
+// CHECK: }
+// CHECK: Homotopy generators: {
 // CHECK: }
 // CHECK: Property map: {
 // CHECK:   [P1a:T] => { conforms_to: [P1] }

test/Generics/unify_concrete_types_2.swift

@@ -29,10 +29,10 @@ struct MergeTest<G : P1a & P2a> {
 
 // CHECK-LABEL: Adding generic signature <τ_0_0 where τ_0_0 : P1a, τ_0_0 : P2a> {
 // CHECK-LABEL: Rewrite system: {
-// CHECK: - τ_0_0.[P2a:T] => τ_0_0.[P1a&P2a:T]
 // CHECK: - τ_0_0.[P1a:T] => τ_0_0.[P1a&P2a:T]
-// CHECK: - [P1a&P2a:T].[P2:X] => [P1a&P2a:T].[P1&P2:X]
+// CHECK: - τ_0_0.[P2a:T] => τ_0_0.[P1a&P2a:T]
 // CHECK: - [P1a&P2a:T].[P1:X] => [P1a&P2a:T].[P1&P2:X]
+// CHECK: - [P1a&P2a:T].[P2:X] => [P1a&P2a:T].[P1&P2:X]
 // CHECK: - τ_0_0.[P1a&P2a:T].[P2:Y2] => τ_0_0.[P1a&P2a:T].[P1:Y1]
 // CHECK: - τ_0_0.[P1a&P2a:T].[P2:Z2] => τ_0_0.[P1a&P2a:T].[P1:Z1]
 // CHECK: }

test/Generics/unify_superclass_types_1.swift

@@ -22,6 +22,8 @@ extension P where Self : Derived {
 // CHECK-NEXT: - τ_0_0.[P] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[superclass: Base] => τ_0_0
 // CHECK-NEXT: }
+// CHECK-NEXT: Homotopy generators: {
+// CHECK:      }
 // CHECK-NEXT: Property map: {
 // CHECK-NEXT:   [P] => { layout: _NativeClass superclass: [superclass: Base] }
 // CHECK-NEXT:   τ_0_0 => { conforms_to: [P] layout: _NativeClass superclass: [superclass: Derived] }

test/Generics/unify_superclass_types_2.swift

@@ -37,6 +37,8 @@ func unifySuperclassTest<T : P1 & P2>(_: T) {
 // CHECK-NEXT: - τ_0_0.[P1:A1].[concrete: String] => τ_0_0.[P1:A1]
 // CHECK-NEXT: - τ_0_0.[P2:B2] => τ_0_0.[P1:B1]
 // CHECK:      }
+// CHECK-NEXT: Homotopy generators: {
+// CHECK:      }
 // CHECK-NEXT: Property map: {
 // CHECK-NEXT:   [P1:X] => { layout: _NativeClass superclass: [superclass: Generic<Int, τ_0_0, τ_0_1> with <[P1:A1], [P1:B1]>] }
 // CHECK-NEXT:   [P2:X] => { layout: _NativeClass superclass: [superclass: Generic<τ_0_0, String, τ_0_1> with <[P2:A2], [P2:B2]>] }

test/Generics/unify_superclass_types_3.swift

@@ -38,7 +38,10 @@ func unifySuperclassTest<T : P1 & P2>(_: T) {
 // CHECK-NEXT: - τ_0_0.[P2:A2].[concrete: Int] => τ_0_0.[P2:A2]
 // CHECK-NEXT: - τ_0_0.[P1:A1].[concrete: String] => τ_0_0.[P1:A1]
 // CHECK-NEXT: - τ_0_0.[P2:B2] => τ_0_0.[P1:B1]
+// CHECK-NEXT: - τ_0_0.B2 => τ_0_0.[P1:B1]
 // CHECK-NEXT: }
+// CHECK-NEXT: Homotopy generators: {
+// CHECK:      }
 // CHECK-NEXT: Property map: {
 // CHECK-NEXT:   [P1:X] => { layout: _NativeClass superclass: [superclass: Derived<τ_0_0, τ_0_1> with <[P1:A1], [P1:B1]>] }
 // CHECK-NEXT:   [P2:X] => { layout: _NativeClass superclass: [superclass: Generic<τ_0_0, String, τ_0_1> with <[P2:A2], [P2:B2]>] }

test/Generics/unify_superclass_types_4.swift

@@ -40,6 +40,8 @@ func unifySuperclassTest<T : P1 & P2>(_: T) {
 // CHECK-NEXT: - τ_0_0.[P1&P2:X].[superclass: Base<τ_0_0> with <τ_0_0.[P1:A1]>] => τ_0_0.[P1&P2:X]
 // CHECK-NEXT: - τ_0_0.[P2:A2].[Q:T] => τ_0_0.[P1:A1]
 // CHECK-NEXT: }
+// CHECK-NEXT: Homotopy generators: {
+// CHECK:      }
 // CHECK-NEXT: Property map: {
 // CHECK-NEXT:   [P1:X] => { layout: _NativeClass superclass: [superclass: Base<τ_0_0> with <[P1:A1]>] }
 // CHECK-NEXT:   [P2:A2] => { conforms_to: [Q] }