Test: updates for NoncopyableGenerics

kavon · kavon · commit 4f905cc551f5 · 2024-03-16T09:16:16.000-07:00
These tests of the type system are being updated because of the new presence of Copyable and Escapable conformances & conformance requirements. (cherry picked from commit 102ccbc)
diff --git a/test/Constraints/result_builder_generic_infer.swift b/test/Constraints/result_builder_generic_infer.swift
@@ -1,7 +1,5 @@
 // RUN: %target-swift-frontend -dump-ast %s | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 protocol P {
   associatedtype A
 
@@ -24,34 +22,34 @@ struct ProtocolSubstitution: P {
   typealias A = Int
 
   // CHECK: var_decl{{.*}}x1
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> ProtocolSubstitution.A)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> ProtocolSubstitution.A)
   var x1: [S] { S() }
 
   // CHECK: var_decl{{.*}}x2
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> ProtocolSubstitution)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> ProtocolSubstitution)
   var x2: [S] { S() }
 }
 
 // CHECK: struct_decl{{.*}}ArchetypeSubstitution
 struct ArchetypeSubstitution<A>: P {
   // CHECK: var_decl{{.*}}x1
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> A)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> A)
   var x1: [S] { S() }
 
   // CHECK: var_decl{{.*}}x2
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> ArchetypeSubstitution<A>)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> ArchetypeSubstitution<A>)
   var x2: [S] { S() }
 }
 
 // CHECK-LABEL: struct_decl{{.*}}ExplicitGenericAttribute
 struct ExplicitGenericAttribute<T: P> {
   // CHECK: var_decl{{.*}}x1
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> T)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> T)
   @Builder<T>
   var x1: [S] { S() }
 
   // CHECK: var_decl{{.*}}x2
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> T.A)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> T.A)
   @Builder<T.A>
   var x2: [S] { S() }
 }
@@ -63,10 +61,10 @@ extension ConcreteTypeSubstitution: P where Value == Int {
   typealias A = Value
 
   // CHECK: var_decl{{.*}}x1
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> ConcreteTypeSubstitution<Int>.A)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> ConcreteTypeSubstitution<Int>.A)
   var x1: [S] { S() }
 
   // CHECK: var_decl{{.*}}x2
-  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T> T -> ConcreteTypeSubstitution<Int>)
+  // CHECK: Builder.buildBlock{{.*}}(substitution_map generic_signature=<T where T : Copyable, T : Escapable> T -> ConcreteTypeSubstitution<Int>)
   var x2: [S] { S() }
 }
diff --git a/test/Generics/conditional_conformances.swift b/test/Generics/conditional_conformances.swift
diff --git a/test/Generics/generic_objc_superclass.swift b/test/Generics/generic_objc_superclass.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift %clang-importer-sdk -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 // REQUIRES: objc_interop
 
 import Foundation
@@ -15,9 +13,16 @@ func foo<T : Generic<U>, U>(_: T, _: U) {
 
 // CHECK: Requirement machine for fresh signature < T U >
 // CHECK-NEXT: Rewrite system: {
+// CHECK-NEXT: - [Copyable].[Copyable] => [Copyable] [permanent]
+// CHECK-NEXT: - [Escapable].[Escapable] => [Escapable] [permanent]
+// CHECK-NEXT: - τ_0_1.[Copyable] => τ_0_1 [explicit]
+// CHECK-NEXT: - τ_0_1.[Escapable] => τ_0_1 [explicit]
 // CHECK-NEXT: - τ_0_0.[superclass: Generic<τ_0_1>] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[layout: AnyObject] => τ_0_0
 // CHECK-NEXT: }
 // CHECK: Property map: {
+// CHECK-NEXT:   [Copyable] => { conforms_to: [Copyable] }
+// CHECK-NEXT:   [Escapable] => { conforms_to: [Escapable] }
+// CHECK-NEXT:   τ_0_1 => { conforms_to: [Copyable Escapable] }
 // CHECK-NEXT:   τ_0_0 => { layout: AnyObject superclass: [superclass: Generic<τ_0_1>] }
 // CHECK-NEXT: }
diff --git a/test/Generics/minimal_conformances_compare_concrete.swift b/test/Generics/minimal_conformances_compare_concrete.swift
@@ -2,8 +2,6 @@
 // RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
 // RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction -dump-requirement-machine 2>&1 | %FileCheck %s --check-prefix=RULE
 
-// XFAIL: noncopyable_generics
-
 protocol P {}
 
 class Base : P {}
@@ -21,13 +19,23 @@ extension G where X : Base, X : P, X == Derived {}
 // RULE: + (requirement "\xCF\x84_0_0" same_type "Derived")
 
 // RULE: Rewrite system: {
+// RULE-NEXT: - [Copyable].[Copyable] => [Copyable] [permanent]
+// RULE-NEXT: - [Escapable].[Escapable] => [Escapable] [permanent]
 // RULE-NEXT: - [P].[P] => [P] [permanent]
+// RULE-NEXT: - [P].[Copyable] => [P] [explicit]
+// RULE-NEXT: - [P].[Escapable] => [P] [explicit]
+// RULE-NEXT: - τ_0_0.[Copyable] => τ_0_0 [explicit]
+// RULE-NEXT: - τ_0_0.[Escapable] => τ_0_0 [explicit]
 // RULE-NEXT: - τ_0_0.[superclass: Base] => τ_0_0 [explicit]
 // RULE-NEXT: - τ_0_0.[P] => τ_0_0 [explicit]
 // RULE-NEXT: - τ_0_0.[concrete: Derived] => τ_0_0 [explicit]
 // RULE-NEXT: - τ_0_0.[layout: _NativeClass] => τ_0_0
 // RULE-NEXT: - τ_0_0.[superclass: Derived] => τ_0_0
+// RULE-NEXT: - τ_0_0.[concrete: Derived : Copyable] => τ_0_0
+// RULE-NEXT: - τ_0_0.[concrete: Derived : Escapable] => τ_0_0
 // RULE-NEXT: - τ_0_0.[concrete: Derived : P] => τ_0_0
+// RULE-NEXT: - τ_0_0.[concrete: Base : Copyable] => τ_0_0
+// RULE-NEXT: - τ_0_0.[concrete: Base : Escapable] => τ_0_0
 // RULE-NEXT: - τ_0_0.[concrete: Base : P] => τ_0_0
 // RULE-NEXT: }
 
diff --git a/test/Generics/rdar123013710.swift b/test/Generics/rdar123013710.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift
 
-// XFAIL: noncopyable_generics
-
 public protocol P {
     associatedtype A
     associatedtype B: P
@@ -17,7 +15,7 @@ extension Never: Q, P { // expected-note 2{{through reference here}}
    public static func f() -> Any? { nil }
 }
 
-extension Q {
-   public var b: Never { fatalError() } // expected-note {{through reference here}}
+extension Q { // expected-note {{through reference here}}
+   public var b: Never { fatalError() } // expected-note 4{{through reference here}}
 }
 
diff --git a/test/Generics/rdar79564324.swift b/test/Generics/rdar79564324.swift
@@ -2,8 +2,6 @@
 // RUN: %target-swift-frontend -emit-module %S/Inputs/rdar79564324_other.swift -emit-module-path %t/rdar79564324_other.swiftmodule -dump-requirement-machine 2>&1 | %FileCheck %s
 // RUN: %target-swift-frontend -emit-silgen %s -I %t
 
-// XFAIL: noncopyable_generics
-
 import rdar79564324_other
 
 public func test<T : P>(_ t: T) where T == T.A {
@@ -28,18 +26,30 @@ public func test<T : P>(_ t: T) where T == T.A {
 // CHECK-NEXT: - [P].[P] => [P] [permanent]
 // CHECK-NEXT: - [P].A => [P:A] [permanent]
 // CHECK-NEXT: - [P:A].[P] => [P:A]
+// CHECK-NEXT: - [P].[Copyable] => [P] [explicit]
+// CHECK-NEXT: - [P].[Escapable] => [P] [explicit]
+// CHECK-NEXT: - [P:A].[Copyable] => [P:A] [explicit]
+// CHECK-NEXT: - [P:A].[Escapable] => [P:A] [explicit]
 // CHECK-NEXT: - [P].[P:A] => [P:A]
 // CHECK-NEXT: - [P:A].A => [P:A].[P:A]
+// CHECK-NEXT: - [Copyable].[Copyable] => [Copyable] [permanent]
+// CHECK-NEXT: - [Escapable].[Escapable] => [Escapable] [permanent]
 // CHECK-NEXT: - τ_0_0.A => τ_0_0
 // CHECK-NEXT: - τ_0_1.[P] => τ_0_1
 // CHECK-NEXT: - τ_0_1.A => τ_0_0
+// CHECK-NEXT: - τ_0_0.[Copyable] => τ_0_0 [explicit]
+// CHECK-NEXT: - τ_0_0.[Escapable] => τ_0_0 [explicit]
+// CHECK-NEXT: - τ_0_1.[Copyable] => τ_0_1 [explicit]
+// CHECK-NEXT: - τ_0_1.[Escapable] => τ_0_1 [explicit]
 // CHECK-NEXT: - τ_0_1.[P:A] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[P] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[P:A] => τ_0_0
 // CHECK-NEXT: }
 // CHECK: Property map: {
-// CHECK-NEXT:   [P] => { conforms_to: [P] }
-// CHECK-NEXT:   [P:A] => { conforms_to: [P] }
-// CHECK-NEXT:   τ_0_1 => { conforms_to: [P] }
-// CHECK-NEXT:   τ_0_0 => { conforms_to: [P] }
+// CHECK-NEXT:   [P] => { conforms_to: [P Copyable Escapable] }
+// CHECK-NEXT:   [P:A] => { conforms_to: [P Copyable Escapable] }
+// CHECK-NEXT:   [Copyable] => { conforms_to: [Copyable] }
+// CHECK-NEXT:   [Escapable] => { conforms_to: [Escapable] }
+// CHECK-NEXT:   τ_0_1 => { conforms_to: [P Copyable Escapable] }
+// CHECK-NEXT:   τ_0_0 => { conforms_to: [Copyable Escapable P] }
 // CHECK-NEXT: }
diff --git a/test/Generics/tuple-conformances.swift b/test/Generics/tuple-conformances.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature TupleConformances
 
-// XFAIL: noncopyable_generics
-
 // Because of -enable-experimental-feature TupleConformances
 // REQUIRES: asserts
 
diff --git a/test/Generics/unify_associated_types.swift b/test/Generics/unify_associated_types.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 struct Foo<A, B> {}
 
 protocol P1 {
@@ -29,6 +27,6 @@ struct MergeTest<G : P1a & P2a> {}
 // CHECK: - τ_0_0.[P1a:T].[P2:X] => τ_0_0.[P1a:T].[P1:X]
 // CHECK: }
 // CHECK: Property map: {
-// CHECK:   τ_0_0 => { conforms_to: [P1a P2a] }
-// CHECK:   τ_0_0.[P1a:T] => { conforms_to: [P1 P2] }
+// CHECK:   τ_0_0 => { conforms_to: [P1a P2a Copyable Escapable] }
+// CHECK:   τ_0_0.[P1a:T] => { conforms_to: [P1 Copyable Escapable P2] }
 // CHECK: }
diff --git a/test/Generics/unify_concrete_types_1.swift b/test/Generics/unify_concrete_types_1.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 struct Foo<A, B> {}
 
 protocol P1 {
@@ -29,5 +27,5 @@ struct MergeTest<G : P1 & P2> {
 // CHECK-LABEL: Property map: {
 // CHECK:  [P1:X] => { concrete_type: [concrete: Foo<[P1:Y1], [P1:Z1]>] }
 // CHECK:  [P2:X] => { concrete_type: [concrete: Foo<[P2:Y2], [P2:Z2]>] }
-// CHECK:  τ_0_0 => { conforms_to: [P1 P2] }
+// CHECK:  τ_0_0 => { conforms_to: [P1 P2 Copyable Escapable] }
 // CHECK: }
diff --git a/test/Generics/unify_nested_types_3.swift b/test/Generics/unify_nested_types_3.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 protocol P1 {
   associatedtype T : P1
 }
@@ -34,6 +32,6 @@ struct G<T : P2a & P3a> {}
 // CHECK: - τ_0_0.[P2a:T].[P2:T].[concrete: X<τ_0_0.[P3a:U].[P1:T]>] => τ_0_0.[P2a:T].[P2:T]
 // CHECK: }
 // CHECK-LABEL: Property map: {
-// CHECK: τ_0_0.[P2a:T] => { conforms_to: [P2] concrete_type: [concrete: X<τ_0_0.[P3a:U]>] }
-// CHECK: τ_0_0.[P2a:T].[P2:T] => { concrete_type: [concrete: X<τ_0_0.[P3a:U].[P1:T]>] }
+// CHECK: τ_0_0.[P2a:T] => { conforms_to: [P2 Copyable Escapable] concrete_type: [concrete: X<τ_0_0.[P3a:U]>] }
+// CHECK: τ_0_0.[P2a:T].[P2:T] => { conforms_to: [Copyable Escapable] concrete_type: [concrete: X<τ_0_0.[P3a:U].[P1:T]>] }
 // CHECK: }
diff --git a/test/Generics/unify_nested_types_4.swift b/test/Generics/unify_nested_types_4.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 protocol P1 {
   associatedtype A : P1
   associatedtype B : P1
@@ -58,8 +56,8 @@ struct G<T : P1 & P2> {}
 // CHECK: - τ_0_0.[P1:B].[P1:B].[P1:B] => τ_0_0.[P1:B]
 // CHECK: }
 // CHECK-LABEL: Property map: {
-// CHECK: τ_0_0.[P1:A] => { conforms_to: [P1] concrete_type: [concrete: S1] }
-// CHECK: τ_0_0.[P1:B] => { conforms_to: [P1] concrete_type: [concrete: S2] }
-// CHECK: τ_0_0.[P1:A].[P1:B] => { conforms_to: [P1] concrete_type: [concrete: S2] }
-// CHECK: τ_0_0.[P1:B].[P1:B] => { conforms_to: [P1] concrete_type: [concrete: S1] }
+// CHECK: τ_0_0.[P1:A] => { conforms_to: [P1 Copyable Escapable] concrete_type: [concrete: S1] }
+// CHECK: τ_0_0.[P1:B] => { conforms_to: [P1 Copyable Escapable] concrete_type: [concrete: S2] }
+// CHECK: τ_0_0.[P1:A].[P1:B] => { conforms_to: [P1 Copyable Escapable] concrete_type: [concrete: S2] }
+// CHECK: τ_0_0.[P1:B].[P1:B] => { conforms_to: [P1 Copyable Escapable] concrete_type: [concrete: S1] }
 // CHECK: }
diff --git a/test/Generics/unify_superclass_types_1.swift b/test/Generics/unify_superclass_types_1.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 class Base {}
 class Derived : Base {
   func derivedMethod() {}
@@ -20,12 +18,16 @@ extension P where Self : Derived {
 // CHECK-NEXT: - [P].[P] => [P] [permanent]
 // CHECK-NEXT: - [P].[superclass: Base] => [P]
 // CHECK-NEXT: - [P].[layout: _NativeClass] => [P]
+// CHECK-NEXT: - [Copyable].[Copyable] => [Copyable] [permanent]
+// CHECK-NEXT: - [Escapable].[Escapable] => [Escapable] [permanent]
 // CHECK-NEXT: - τ_0_0.[P] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[superclass: Derived] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[superclass: Base] => τ_0_0
 // CHECK-NEXT: - τ_0_0.[layout: _NativeClass] => τ_0_0
 // CHECK-NEXT: }
 // CHECK: Property map: {
 // CHECK-NEXT:   [P] => { conforms_to: [P] layout: _NativeClass superclass: [superclass: Base] }
+// CHECK-NEXT:   [Copyable] => { conforms_to: [Copyable] }
+// CHECK-NEXT:   [Escapable] => { conforms_to: [Escapable] }
 // CHECK-NEXT:   τ_0_0 => { conforms_to: [P] layout: _NativeClass superclass: [superclass: Derived] }
 // CHECK-NEXT: }
diff --git a/test/Generics/unify_superclass_types_2.swift b/test/Generics/unify_superclass_types_2.swift
@@ -1,8 +1,6 @@
 // RUN: %target-typecheck-verify-swift -debug-generic-signatures -disable-requirement-machine-reuse 2>&1 | %FileCheck %s
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine -disable-requirement-machine-reuse 2>&1 | %FileCheck %s --check-prefix=CHECK-RULE
 
-// XFAIL: noncopyable_generics
-
 // Note: The GSB fails this test, because it doesn't implement unification of
 // superclass type constructor arguments.
 
@@ -51,12 +49,18 @@ func unifySuperclassTest<T : P1 & P2>(_: T) {
 // CHECK-RULE:      - τ_0_0.B2 => τ_0_0.[P1:B1]
 // CHECK-RULE:      }
 // CHECK-RULE: Property map: {
-// CHECK-RULE-NEXT:   [P1] => { conforms_to: [P1] }
+// CHECK-RULE-NEXT:   [P1] => { conforms_to: [P1 Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P1:A1] => { conforms_to: [Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P1:B1] => { conforms_to: [Copyable Escapable] }
 // CHECK-RULE-NEXT:   [P1:X] => { layout: _NativeClass superclass: [superclass: Generic<Int, [P1:A1], [P1:B1]>] }
-// CHECK-RULE-NEXT:   [P2] => { conforms_to: [P2] }
+// CHECK-RULE-NEXT:   [P2] => { conforms_to: [P2 Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P2:A2] => { conforms_to: [Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P2:B2] => { conforms_to: [Copyable Escapable] }
 // CHECK-RULE-NEXT:   [P2:X] => { layout: _NativeClass superclass: [superclass: Generic<[P2:A2], String, [P2:B2]>] }
-// CHECK-RULE-NEXT:   τ_0_0 => { conforms_to: [P1 P2] }
-// CHECK-RULE-NEXT:   τ_0_0.[P1:A1] => { concrete_type: [concrete: String] }
+// CHECK-RULE-NEXT:   [Copyable] => { conforms_to: [Copyable] }
+// CHECK-RULE-NEXT:   [Escapable] => { conforms_to: [Escapable] }
+// CHECK-RULE-NEXT:   τ_0_0 => { conforms_to: [P1 P2 Copyable Escapable] }
+// CHECK-RULE-NEXT:   τ_0_0.[P1:A1] => { conforms_to: [Copyable Escapable] concrete_type: [concrete: String] }
 // CHECK-RULE-NEXT:   τ_0_0.[P1:X] => { layout: _NativeClass superclass: [superclass: Generic<Int, String, τ_0_0.[P1:B1]>] }
-// CHECK-RULE-NEXT:   τ_0_0.[P2:A2] => { concrete_type: [concrete: Int] }
+// CHECK-RULE-NEXT:   τ_0_0.[P2:A2] => { conforms_to: [Copyable Escapable] concrete_type: [concrete: Int] }
 // CHECK-RULE-NEXT: }
diff --git a/test/Generics/unify_superclass_types_3.swift b/test/Generics/unify_superclass_types_3.swift
@@ -1,8 +1,6 @@
 // RUN: %target-typecheck-verify-swift -debug-generic-signatures -disable-requirement-machine-reuse 2>&1 | %FileCheck %s
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine -disable-requirement-machine-reuse 2>&1 | %FileCheck %s --check-prefix=CHECK-RULE
 
-// XFAIL: noncopyable_generics
-
 // Note: The GSB fails this test, because it doesn't implement unification of
 // superclass type constructor arguments.
 
@@ -55,12 +53,18 @@ func unifySuperclassTest<T : P1 & P2>(_: T) {
 // CHECK-RULE:      - τ_0_0.B2 => τ_0_0.[P1:B1]
 // CHECK-RULE:      }
 // CHECK-RULE: Property map: {
-// CHECK-RULE-NEXT:   [P1] => { conforms_to: [P1] }
+// CHECK-RULE-NEXT:   [P1] => { conforms_to: [P1 Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P1:A1] => { conforms_to: [Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P1:B1] => { conforms_to: [Copyable Escapable] }
 // CHECK-RULE-NEXT:   [P1:X] => { layout: _NativeClass superclass: [superclass: Derived<[P1:A1], [P1:B1]>] }
-// CHECK-RULE-NEXT:   [P2] => { conforms_to: [P2] }
+// CHECK-RULE-NEXT:   [P2] => { conforms_to: [P2 Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P2:A2] => { conforms_to: [Copyable Escapable] }
+// CHECK-RULE-NEXT:   [P2:B2] => { conforms_to: [Copyable Escapable] }
 // CHECK-RULE-NEXT:   [P2:X] => { layout: _NativeClass superclass: [superclass: Generic<[P2:A2], String, [P2:B2]>] }
-// CHECK-RULE-NEXT:   τ_0_0 => { conforms_to: [P1 P2] }
-// CHECK-RULE-NEXT:   τ_0_0.[P2:A2] => { concrete_type: [concrete: Int] }
+// CHECK-RULE-NEXT:   [Copyable] => { conforms_to: [Copyable] }
+// CHECK-RULE-NEXT:   [Escapable] => { conforms_to: [Escapable] }
+// CHECK-RULE-NEXT:   τ_0_0 => { conforms_to: [P1 P2 Copyable Escapable] }
+// CHECK-RULE-NEXT:   τ_0_0.[P2:A2] => { conforms_to: [Copyable Escapable] concrete_type: [concrete: Int] }
 // CHECK-RULE-NEXT:   τ_0_0.[P1:X] => { layout: _NativeClass superclass: [superclass: Derived<τ_0_0.[P1:A1], τ_0_0.[P1:B1]>] }
-// CHECK-RULE-NEXT:   τ_0_0.[P1:A1] => { concrete_type: [concrete: String] }
+// CHECK-RULE-NEXT:   τ_0_0.[P1:A1] => { conforms_to: [Copyable Escapable] concrete_type: [concrete: String] }
 // CHECK-RULE-NEXT: }
diff --git a/test/Generics/unify_superclass_types_4.swift b/test/Generics/unify_superclass_types_4.swift
@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -dump-requirement-machine 2>&1 | %FileCheck %s
 
-// XFAIL: noncopyable_generics
-
 // Note: The GSB fails this test, because it doesn't implement unification of
 // superclass type constructor arguments.
 
@@ -47,12 +45,16 @@ func unifySuperclassTest<T : P1 & P2>(_: T) {
 // CHECK:      - τ_0_0.[P2:A2].[Q:T] => τ_0_0.[P1:A1]
 // CHECK-NEXT: }
 // CHECK: Property map: {
-// CHECK-NEXT:   [P1] => { conforms_to: [P1] }
+// CHECK-NEXT:   [P1] => { conforms_to: [P1 Copyable Escapable] }
 // CHECK-NEXT:   [P1:X] => { layout: _NativeClass superclass: [superclass: Base<[P1:A1]>] }
-// CHECK-NEXT:   [P2] => { conforms_to: [P2] }
+// CHECK-NEXT:   [P1:A1] => { conforms_to: [Copyable Escapable] }
+// CHECK-NEXT:   [P2] => { conforms_to: [P2 Copyable Escapable] }
 // CHECK-NEXT:   [P2:X] => { layout: _NativeClass superclass: [superclass: Derived<[P2:A2]>] }
-// CHECK-NEXT:   [P2:A2] => { conforms_to: [Q] }
-// CHECK-NEXT:   [Q] => { conforms_to: [Q] }
-// CHECK-NEXT:   τ_0_0 => { conforms_to: [P1 P2] }
+// CHECK-NEXT:   [P2:A2] => { conforms_to: [Q Copyable Escapable] }
+// CHECK-NEXT:   [Copyable] => { conforms_to: [Copyable] }
+// CHECK-NEXT:   [Escapable] => { conforms_to: [Escapable] }
+// CHECK-NEXT:   [Q] => { conforms_to: [Q Copyable Escapable] }
+// CHECK-NEXT:   [Q:T] => { conforms_to: [Copyable Escapable] }
+// CHECK-NEXT:   τ_0_0 => { conforms_to: [P1 P2 Copyable Escapable] }
 // CHECK-NEXT:   τ_0_0.[P1:X] => { layout: _NativeClass superclass: [superclass: Derived<τ_0_0.[P2:A2]>] }
 // CHECK-NEXT: }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`// RUN: %target-typecheck-verify-swift`
`2`	`2`
`3`		`-// XFAIL: noncopyable_generics`
`4`		`-`
`5`	`3`	`public protocol P {`
`6`	`4`	`associatedtype A`
`7`	`5`	`associatedtype B: P`
`@@ -17,7 +15,7 @@ extension Never: Q, P { // expected-note 2{{through reference here}}`
`17`	`15`	`public static func f() -> Any? { nil }`
`18`	`16`	`}`
`19`	`17`
`20`		`-extension Q {`
`21`		`- public var b: Never { fatalError() } // expected-note {{through reference here}}`
	`18`	`+extension Q { // expected-note {{through reference here}}`
	`19`	`+ public var b: Never { fatalError() } // expected-note 4{{through reference here}}`
`22`	`20`	`}`
`23`	`21`