Skip to content

Commit b4b8733

Browse files
slavapestovslavapestov
committed
Update -requirement-machine-* flags in various tests
- Don't pass 'verify' since it's now the default - Update tests where diagnostics changed in a correct way to pass 'on' instead - Delete compiler_scale/explicit_requirements_perf.swift since it's not testing anything with the requirement machine
1 parent ce600d8 commit b4b8733

File tree

55 files changed

+123
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+123
-156
lines changed

‎test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-emit-silgen -verify -module-name main %s | %FileCheck %s
2-
// RUN: %target-swift-emit-sil -verify -module-name main %s
1+
// RUN: %target-swift-emit-silgen -verify -module-name main %s -requirement-machine-inferred-signatures=on | %FileCheck %s
2+
// RUN: %target-swift-emit-sil -verify -module-name main %s -requirement-machine-inferred-signatures=on
33

44
// NOTE(SR-11950): SILParser crashes for SILGen round-trip.
55

@@ -84,7 +84,7 @@ extension AllConcrete where T == Float {
8484
// Derivative generic signature: `<T where T == Float>` (explicit `where` clause)
8585
// Witness generic signature: none
8686
@_silgen_name("allconcrete_where_gensig")
87-
@differentiable(reverse where T == Float)
87+
@differentiable(reverse where T == Float) // expected-warning {{redundant same-type constraint 'T' == 'Float'}}
8888
func whereClauseGenericSignature() -> AllConcrete {
8989
return self
9090
}
@@ -158,7 +158,7 @@ extension NotAllConcrete where T == Float {
158158
// Derivative generic signature: `<T, U where T == Float>` (explicit `where` clause)
159159
// Witness generic signature: `<T, U where T == Float>` (not all concrete)
160160
@_silgen_name("notallconcrete_where_gensig")
161-
@differentiable(reverse where T == Float)
161+
@differentiable(reverse where T == Float) // expected-warning {{redundant same-type constraint 'T' == 'Float'}}
162162
func whereClauseGenericSignature() -> NotAllConcrete {
163163
return self
164164
}

‎test/AutoDiff/SILOptimizer/generics.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-sil -verify %s -requirement-machine-abstract-signatures=verify | %FileCheck %s -check-prefix=CHECK-SIL
1+
// RUN: %target-swift-emit-sil -verify %s -requirement-machine-inferred-signatures=on | %FileCheck %s -check-prefix=CHECK-SIL
22

33
import _Differentiation
44

@@ -51,12 +51,12 @@ func foo<T>(_ x: Wrapper<T>) {
5151

5252
// Test case where associated derivative function's requirements are met.
5353
extension Wrapper where Scalar : Numeric {
54-
@differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint)
54+
@differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint) // expected-warning {{redundant conformance constraint 'Scalar' : 'Differentiable'}}
5555
func mean() -> Wrapper {
5656
return self
5757
}
5858

59-
@differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint)
59+
@differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint) // expected-warning {{redundant conformance constraint 'Scalar' : 'Differentiable'}}
6060
func variance() -> Wrapper {
6161
return mean() // ok
6262
}

‎test/Compatibility/anyobject_class.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// RUN: %target-typecheck-verify-swift -swift-version 4
2-
// RUN: not %target-swift-frontend -typecheck -swift-version 5
1+
// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on
2+
// RUN: not %target-swift-frontend -typecheck -swift-version 5 -requirement-machine-protocol-signatures=on
33

44
protocol P : class, AnyObject { } // expected-warning{{redundant inheritance from 'AnyObject' and Swift 3 'class' keyword}}{{14-21=}}
55
// expected-warning@-1{{redundant constraint 'Self' : 'AnyObject'}}
6-
// expected-note@-2{{constraint 'Self' : 'AnyObject' implied here}}

‎test/Generics/associated_type_where_clause.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -swift-version 4
1+
// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on
22

33
func needsSameType<T>(_: T.Type, _: T.Type) {}
44

@@ -133,7 +133,6 @@ struct X { }
133133

134134
protocol P {
135135
associatedtype P1 where P1 == X
136-
// expected-note@-1{{same-type constraint 'Self.P1' == 'X' written here}}
137136
associatedtype P2 where P2 == P1, P2 == X
138137
// expected-warning@-1{{redundant same-type constraint 'Self.P2' == 'X'}}
139138
}

‎test/Generics/canonicalization.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift
1+
// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on
22

33
// rdar://problem/23149063
44
protocol P0 { }
@@ -13,8 +13,6 @@ protocol Q : P {
1313

1414
func f<T>(t: T) where T : P, T : Q, T.A : P0 { } // expected-note{{'f(t:)' previously declared here}}
1515
// expected-warning@-1{{redundant conformance constraint 'T' : 'P'}}
16-
// expected-note@-2{{conformance constraint 'T' : 'P' implied here}}
1716

1817
func f<T>(t: T) where T : Q, T : P, T.A : P0 { } // expected-error{{invalid redeclaration of 'f(t:)'}}
1918
// expected-warning@-1{{redundant conformance constraint 'T' : 'P'}}
20-
// expected-note@-2{{conformance constraint 'T' : 'P' implied here}}

‎test/Generics/concrete_conformances_in_protocol.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=verify 2>&1 | %FileCheck %s
1+
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
22

33
// rdar://problem/88135912
44
// XFAIL: *

‎test/Generics/concrete_nesting_elimination_order.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=verify 2>&1 | %FileCheck %s
2-
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=verify -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
1+
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
2+
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
33

44
protocol P1 {
55
associatedtype T
@@ -45,4 +45,4 @@ protocol P8a : P7 where Y == C {}
4545

4646
protocol P8b : P7 where Y == C {}
4747

48-
// Make sure we pick 'Y == C' and not 'Y == G<C>' here.
48+
// Make sure we pick 'Y == C' and not 'Y == G<C>' here.

‎test/Generics/concrete_protocol_typealias_minimization.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=verify -requirement-machine-protocol-signatures=verify 2>&1 | %FileCheck %s
1+
// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
22

33
protocol P1a {
44
typealias X = Int

‎test/Generics/conditional_conformances.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-typecheck-verify-swift
2-
// RUN: %target-typecheck-verify-swift -debug-generic-signatures > %t.dump 2>&1
1+
// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on
2+
// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-inferred-signatures=on > %t.dump 2>&1
33
// RUN: %FileCheck %s < %t.dump
44

55
protocol P1 {}
@@ -55,6 +55,7 @@ struct RedundantSuper<T: P4> {}
5555
// CHECK-LABEL: ExtensionDecl line={{.*}} base=RedundantSuper
5656
// CHECK-NEXT: (normal_conformance type=RedundantSuper<T> protocol=P2)
5757
extension RedundantSuper: P2 where T: P1 {}
58+
// expected-warning@-1 {{redundant conformance constraint 'T' : 'P1'}}
5859

5960
struct OverlappingSub<T: P1> {}
6061
// CHECK-LABEL: ExtensionDecl line={{.*}} base=OverlappingSub
@@ -187,6 +188,7 @@ struct ClassLessSpecific<T: C3> {}
187188
// CHECK-LABEL: ExtensionDecl line={{.*}} base=ClassLessSpecific
188189
// CHECK-NEXT: (normal_conformance type=ClassLessSpecific<T> protocol=P2)
189190
extension ClassLessSpecific: P2 where T: C1 {}
191+
// expected-warning@-1 {{redundant superclass constraint 'T' : 'C1'}}
190192

191193

192194
// Inherited conformances:

‎test/Generics/conditional_requirement_inference.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %target-typecheck-verify-swift
2-
// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=verify %s 2>&1 | %FileCheck %s
3-
// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=verify %s -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
2+
// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s
3+
// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
44

55
protocol Equatable {}
66

@@ -33,4 +33,4 @@ struct SillyBox<T : First> {
3333
func withArray<U, V>(_: U) where T == Array<U>, V == U.Y {
3434
sameType(U.X.self, U.Y.self)
3535
}
36-
}
36+
}

0 commit comments

Comments
 (0)