Skip to content

Commit dac8d66

Browse files
committed
Stop passing -requirement-machine-{abstract,inferred,protocol}-signatures flags in tests
These flags are now no-ops.
1 parent bfcaa39 commit dac8d66

File tree

195 files changed

+261
-261
lines changed

Some content is hidden

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

195 files changed

+261
-261
lines changed

test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift

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

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

test/AutoDiff/SILOptimizer/generics.swift

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

33
import _Differentiation
44

test/AutoDiff/Sema/differentiable_func_type.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 -verify %s -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on
1+
// RUN: %target-swift-frontend -typecheck -verify %s
22

33
import _Differentiation
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -warn-redundant-requirements
2-
// RUN: not %target-swift-frontend -typecheck -swift-version 5 -requirement-machine-protocol-signatures=on
1+
// RUN: %target-typecheck-verify-swift -swift-version 4 -warn-redundant-requirements
2+
// RUN: not %target-swift-frontend -typecheck -swift-version 5
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'}}

test/Compatibility/stdlib_generic_typealiases.swift

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

33
struct RequiresStrideable<T: Strideable> { }
44

test/Constraints/casts.swift

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

33
class B {
44
init() {}

test/Constraints/generic_super_constraint.swift

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

33
class Base<T> { }
44
class Derived: Base<Int> { }

test/Constraints/generics.swift

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

33
infix operator +++
44

test/Constraints/rdar39931339.swift

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

44
protocol P {}
55

test/Constraints/same_types.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements
2-
// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s
1+
// RUN: %target-typecheck-verify-swift -warn-redundant-requirements
2+
// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
33

44
protocol Fooable {
55
associatedtype Foo // expected-note{{protocol requires nested type 'Foo'; do you want to add it?}}

0 commit comments

Comments
 (0)