From dac8d666ee47fb904dc747e1869f63c2c2c83879 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 10 May 2022 11:53:37 -0400 Subject: [PATCH] Stop passing -requirement-machine-{abstract,inferred,protocol}-signatures flags in tests These flags are now no-ops. --- .../differentiability_witness_generic_signature.swift | 4 ++-- test/AutoDiff/SILOptimizer/generics.swift | 2 +- test/AutoDiff/Sema/differentiable_func_type.swift | 2 +- test/Compatibility/anyobject_class.swift | 4 ++-- test/Compatibility/stdlib_generic_typealiases.swift | 2 +- test/Constraints/casts.swift | 2 +- test/Constraints/generic_super_constraint.swift | 2 +- test/Constraints/generics.swift | 2 +- test/Constraints/rdar39931339.swift | 2 +- test/Constraints/same_types.swift | 4 ++-- test/Generics/abstract_type_witnesses_in_protocols.swift | 4 ++-- .../Generics/abstract_type_witnesses_in_protocols_2.swift | 4 ++-- .../archetype_with_redundant_superclass_conformance.swift | 2 +- test/Generics/associated_type_typo.swift | 4 ++-- test/Generics/associated_type_where_clause.swift | 2 +- .../canonical_concrete_substitutions_in_protocol.swift | 2 +- test/Generics/canonicalization.swift | 2 +- test/Generics/circular_protocol_superclass.swift | 2 +- test/Generics/concrete_conflict.swift | 2 +- test/Generics/concrete_conformance_minimization.swift | 4 ++-- test/Generics/concrete_conformance_rule_simplified.swift | 4 ++-- ...concrete_contraction_substitute_non_nominal_base.swift | 2 +- .../concrete_contraction_unrelated_typealias.swift | 2 +- test/Generics/concrete_nesting_elimination_order_2.swift | 4 ++-- test/Generics/concrete_redundancy_via_adjustment.swift | 2 +- test/Generics/concrete_same_type_versus_anyobject.swift | 4 ++-- test/Generics/conditional_conformances.swift | 4 ++-- .../conditional_requirement_inference_in_protocol.swift | 4 ++-- test/Generics/confluent_example.swift | 2 +- test/Generics/conformance_access_path.swift | 2 +- .../conformance_requirement_with_protocol_typealias.swift | 4 ++-- test/Generics/connected_components_concrete.swift | 2 +- test/Generics/derived_via_concrete.swift | 4 ++-- test/Generics/derived_via_concrete_in_protocol.swift | 4 ++-- test/Generics/generic_types.swift | 2 +- test/Generics/identity_conformance.swift | 2 +- test/Generics/indirectly_concrete_generic_param.swift | 4 ++-- test/Generics/infinite_concrete_type.swift | 2 +- .../inherited_concrete_conformance_in_protocol.swift | 2 +- .../interdependent_protocol_conformance_example_1.swift | 4 ++-- .../interdependent_protocol_conformance_example_2.swift | 4 ++-- .../interdependent_protocol_conformance_example_3.swift | 6 +++--- .../interdependent_protocol_conformance_example_4.swift | 6 +++--- .../interdependent_protocol_conformance_example_5.swift | 6 +++--- test/Generics/invalid.swift | 2 +- test/Generics/joe_monoid.swift | 2 +- test/Generics/loop_normalization_1.swift | 2 +- test/Generics/loop_normalization_2.swift | 2 +- test/Generics/loop_normalization_performance.swift | 2 +- test/Generics/minimal_conformances_compare_concrete.swift | 6 +++--- test/Generics/minimize_concrete_unification.swift | 2 +- .../minimize_superclass_unification_generic_1.swift | 2 +- .../minimize_superclass_unification_generic_2.swift | 2 +- .../minimize_superclass_unification_non_generic.swift | 2 +- test/Generics/non_confluent.swift | 2 +- ...nal_class_conforms_same_type_requirement_on_self.swift | 6 +++--- test/Generics/opaque_archetype_concrete_requirement.swift | 4 ++-- .../opaque_archetype_concrete_requirement_invalid.swift | 2 +- .../opaque_archetype_concrete_requirement_recursive.swift | 4 ++-- ...rchetype_concrete_requirement_recursive_rejected.swift | 2 +- test/Generics/protocol_order.swift | 2 +- test/Generics/protocol_requirement_signatures.swift | 4 ++-- test/Generics/protocol_self_concrete_error.swift | 4 ++-- test/Generics/protocol_type_aliases.swift | 4 ++-- .../protocol_typealias_concrete_unification.swift | 2 +- test/Generics/protocol_typealias_cycle_3.swift | 2 +- test/Generics/protocol_typealias_cycle_4.swift | 2 +- test/Generics/protocol_typealias_cycle_5.swift | 2 +- test/Generics/protocol_typealias_redeclaration.swift | 2 +- test/Generics/protocol_typealias_serialization.swift | 4 ++-- test/Generics/rdar25065503.swift | 2 +- test/Generics/rdar28544316.swift | 2 +- test/Generics/rdar33654588.swift | 2 +- test/Generics/rdar51908331.swift | 2 +- test/Generics/rdar62903491.swift | 4 ++-- test/Generics/rdar65015626.swift | 2 +- test/Generics/rdar65263302.swift | 4 ++-- test/Generics/rdar68084643.swift | 2 +- test/Generics/rdar74890907.swift | 4 ++-- test/Generics/rdar75656022.swift | 4 ++-- test/Generics/rdar77462797.swift | 4 ++-- test/Generics/rdar77683844.swift | 2 +- test/Generics/rdar78233378.swift | 2 +- test/Generics/rdar78643612.swift | 2 +- test/Generics/rdar80503090.swift | 6 +++--- test/Generics/rdar83308672.swift | 2 +- test/Generics/rdar83687967.swift | 4 ++-- test/Generics/rdar83848546.swift | 2 +- test/Generics/rdar83955123.swift | 2 +- test/Generics/rdar86431977.swift | 2 +- test/Generics/rdar90506457.swift | 2 +- test/Generics/rdar90506460.swift | 2 +- test/Generics/rdar91594361.swift | 2 +- test/Generics/reconstitute_sugar.swift | 2 +- test/Generics/redundant_concrete_conformance.swift | 2 +- test/Generics/redundant_parent_path_in_protocol.swift | 2 +- test/Generics/redundant_protocol_composition.swift | 2 +- .../redundant_protocol_inheritance_via_concrete.swift | 2 +- test/Generics/redundant_protocol_refinement.swift | 4 ++-- .../redundant_requirement_self_conforming_protocol.swift | 4 ++-- test/Generics/requirement_inference.swift | 4 ++-- test/Generics/requirement_inference_funny_order.swift | 4 ++-- test/Generics/requirement_machine_diagnostics.swift | 2 +- test/Generics/same_type_constraints.swift | 2 +- test/Generics/same_type_minimize_concrete.swift | 4 ++-- test/Generics/same_type_requirements_in_protocol.swift | 2 +- test/Generics/simplify_concrete_substitutions.swift | 2 +- .../simplify_concrete_substitutions_projection.swift | 2 +- test/Generics/simplify_rhs_elimination_order.swift | 2 +- test/Generics/split_concrete_equivalence_class.swift | 2 +- test/Generics/sr10438.swift | 2 +- test/Generics/sr10532.swift | 2 +- test/Generics/sr10752.swift | 2 +- test/Generics/sr11100.swift | 2 +- test/Generics/sr11153.swift | 4 ++-- test/Generics/sr11997.swift | 2 +- test/Generics/sr12120.swift | 2 +- test/Generics/sr12736.swift | 2 +- test/Generics/sr12980.swift | 2 +- test/Generics/sr13850.swift | 2 +- test/Generics/sr14485.swift | 2 +- test/Generics/sr14510.swift | 4 ++-- test/Generics/sr14580.swift | 4 ++-- test/Generics/sr14917.swift | 2 +- test/Generics/sr15009.swift | 2 +- test/Generics/sr15790.swift | 2 +- test/Generics/sr15826.swift | 2 +- test/Generics/sr16024.swift | 2 +- test/Generics/sr5726.swift | 2 +- test/Generics/sr7353.swift | 2 +- test/Generics/sr8968.swift | 4 ++-- test/Generics/sr9595.swift | 2 +- test/Generics/superclass_and_concrete_requirement.swift | 4 ++-- test/Generics/superclass_and_layout_requirement.swift | 2 +- test/Generics/superclass_constraint.swift | 4 ++-- test/Generics/trivial_reduction.swift | 2 +- test/Generics/unify_protocol_composition.swift | 2 +- test/Generics/validate_stdlib_generic_signatures.swift | 2 +- .../where_clause_contextually_generic_decls.swift | 2 +- test/IDE/print_ast_tc_decls_errors.swift | 2 +- test/Interpreter/polymorphic_builtins.swift | 8 ++++---- test/ModuleInterface/access-filter.swift | 2 +- test/ModuleInterface/specialized-extension.swift | 2 +- test/Parse/deprecated_where.swift | 2 +- test/Prototypes/BigInt.swift | 2 +- .../class_conforms_with_default_concrete_self.swift | 2 +- test/SILGen/protocol_superclass_cycle.swift | 2 +- test/SILGen/subclass_existentials.swift | 4 ++-- .../type_lowering_subst_function_type_caseiterable.swift | 2 +- test/Serialization/Recovery/typedefs.swift | 2 +- test/attr/accessibility_where_clause.swift | 2 +- test/attr/attr_specialize.swift | 2 +- test/decl/circularity.swift | 2 +- test/decl/class/circular_inheritance.swift | 2 +- test/decl/ext/generic.swift | 2 +- test/decl/ext/protocol.swift | 2 +- test/decl/protocol/conforms/circular_validation.swift | 2 +- .../existential_member_accesses_self_assoctype.swift | 2 +- test/decl/protocol/protocol_with_superclass.swift | 2 +- .../protocol/protocol_with_superclass_where_clause.swift | 2 +- test/decl/protocol/protocols.swift | 2 +- test/decl/protocol/recursive_requirement.swift | 2 +- test/decl/protocol/recursive_requirement_ok.swift | 4 ++-- test/decl/protocol/req/associated_type_ambiguity.swift | 4 ++-- test/decl/protocol/req/associated_type_inference.swift | 2 +- .../req/associated_type_inference_fixed_type.swift | 2 +- ...type_inference_fixed_type_experimental_inference.swift | 4 ++-- test/decl/protocol/req/class.swift | 2 +- test/decl/protocol/req/recursion.swift | 2 +- test/decl/protocol/special/JSExport.swift | 4 ++-- test/multifile/protocol-conformance-rdar39805133.swift | 4 ++-- test/type/opaque_parameters.swift | 2 +- test/type/opaque_return_named.swift | 2 +- test/type/parameterized_existential.swift | 2 +- test/type/parameterized_protocol.swift | 4 ++-- test/type/protocol_composition.swift | 2 +- .../compiler_crashers_2_fixed/0145-sr7097.swift | 6 +++--- .../compiler_crashers_2_fixed/0159-rdar40009245.swift | 2 +- .../compiler_crashers_2_fixed/0161-sr6569.swift | 2 +- .../compiler_crashers_2_fixed/0162-sr8019.swift | 2 +- .../compiler_crashers_2_fixed/0164-sr7989.swift | 2 +- ...0173-circular-generic-type-alias-deserialization.swift | 2 +- .../compiler_crashers_2_fixed/0182-rdar45680857.swift | 2 +- .../compiler_crashers_2_fixed/0189-sr10033.swift | 4 ++-- .../compiler_crashers_2_fixed/0192-rdar39826863.swift | 2 +- .../compiler_crashers_2_fixed/rdar56398071.swift | 2 +- .../compiler_crashers_2_fixed/rdar69073431.swift | 2 +- validation-test/compiler_crashers_2_fixed/sr11639.swift | 2 +- validation-test/compiler_crashers_2_fixed/sr9584.swift | 2 +- .../00228-swift-clangimporter-loadextensions.swift | 2 +- .../00237-swift-declrefexpr-setspecialized.swift | 2 +- .../00365-getselftypeforcontainer.swift | 2 +- .../01107-std-function-func-swift-type-subst.swift | 2 +- .../01177-std-function-func-swift-type-subst.swift | 2 +- .../compiler_crashers_fixed/28839-genericsig.swift | 2 +- 195 files changed, 261 insertions(+), 261 deletions(-) diff --git a/test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift b/test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift index 57663a9c8fb..a6b80805870 100644 --- a/test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift +++ b/test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-emit-silgen -verify -module-name main %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements | %FileCheck %s -// RUN: %target-swift-emit-sil -verify -module-name main %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-swift-emit-silgen -verify -module-name main %s -warn-redundant-requirements | %FileCheck %s +// RUN: %target-swift-emit-sil -verify -module-name main %s -warn-redundant-requirements // NOTE(SR-11950): SILParser crashes for SILGen round-trip. diff --git a/test/AutoDiff/SILOptimizer/generics.swift b/test/AutoDiff/SILOptimizer/generics.swift index 99a9279976a..8d6d647c8b9 100644 --- a/test/AutoDiff/SILOptimizer/generics.swift +++ b/test/AutoDiff/SILOptimizer/generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-sil -verify %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements | %FileCheck %s -check-prefix=CHECK-SIL +// RUN: %target-swift-emit-sil -verify %s -warn-redundant-requirements | %FileCheck %s -check-prefix=CHECK-SIL import _Differentiation diff --git a/test/AutoDiff/Sema/differentiable_func_type.swift b/test/AutoDiff/Sema/differentiable_func_type.swift index 8a6e0d9ab89..9ad3c19b4a8 100644 --- a/test/AutoDiff/Sema/differentiable_func_type.swift +++ b/test/AutoDiff/Sema/differentiable_func_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-swift-frontend -typecheck -verify %s import _Differentiation diff --git a/test/Compatibility/anyobject_class.swift b/test/Compatibility/anyobject_class.swift index 3c3bc63610e..6ffa116be1c 100644 --- a/test/Compatibility/anyobject_class.swift +++ b/test/Compatibility/anyobject_class.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck -swift-version 5 -requirement-machine-protocol-signatures=on +// RUN: %target-typecheck-verify-swift -swift-version 4 -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck -swift-version 5 protocol P : class, AnyObject { } // expected-warning{{redundant inheritance from 'AnyObject' and Swift 3 'class' keyword}}{{14-21=}} // expected-warning@-1{{redundant constraint 'Self' : 'AnyObject'}} diff --git a/test/Compatibility/stdlib_generic_typealiases.swift b/test/Compatibility/stdlib_generic_typealiases.swift index 0c72df1bf62..75574a3e920 100644 --- a/test/Compatibility/stdlib_generic_typealiases.swift +++ b/test/Compatibility/stdlib_generic_typealiases.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift struct RequiresStrideable { } diff --git a/test/Constraints/casts.swift b/test/Constraints/casts.swift index 18a1ad3f7f6..9b52dcb8c9b 100644 --- a/test/Constraints/casts.swift +++ b/test/Constraints/casts.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -enable-objc-interop class B { init() {} diff --git a/test/Constraints/generic_super_constraint.swift b/test/Constraints/generic_super_constraint.swift index 6b6a2d035ed..9f2c46e021a 100644 --- a/test/Constraints/generic_super_constraint.swift +++ b/test/Constraints/generic_super_constraint.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift %s -warn-redundant-requirements class Base { } class Derived: Base { } diff --git a/test/Constraints/generics.swift b/test/Constraints/generics.swift index 0c285b510bf..2cbb5031b03 100644 --- a/test/Constraints/generics.swift +++ b/test/Constraints/generics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -enable-objc-interop infix operator +++ diff --git a/test/Constraints/rdar39931339.swift b/test/Constraints/rdar39931339.swift index 58dc052f2ec..c68783cdce6 100644 --- a/test/Constraints/rdar39931339.swift +++ b/test/Constraints/rdar39931339.swift @@ -1,5 +1,5 @@ // RUN: %target-typecheck-verify-swift -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P {} diff --git a/test/Constraints/same_types.swift b/test/Constraints/same_types.swift index 0ba9935113e..88b1c2eb3cf 100644 --- a/test/Constraints/same_types.swift +++ b/test/Constraints/same_types.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol Fooable { associatedtype Foo // expected-note{{protocol requires nested type 'Foo'; do you want to add it?}} diff --git a/test/Generics/abstract_type_witnesses_in_protocols.swift b/test/Generics/abstract_type_witnesses_in_protocols.swift index f92cb0e0def..cf309f098c8 100644 --- a/test/Generics/abstract_type_witnesses_in_protocols.swift +++ b/test/Generics/abstract_type_witnesses_in_protocols.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s protocol P { associatedtype T diff --git a/test/Generics/abstract_type_witnesses_in_protocols_2.swift b/test/Generics/abstract_type_witnesses_in_protocols_2.swift index 92623f55d2a..8c96393f88d 100644 --- a/test/Generics/abstract_type_witnesses_in_protocols_2.swift +++ b/test/Generics/abstract_type_witnesses_in_protocols_2.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s protocol P1 { associatedtype X diff --git a/test/Generics/archetype_with_redundant_superclass_conformance.swift b/test/Generics/archetype_with_redundant_superclass_conformance.swift index 40c20d24ab7..2c580c8a649 100644 --- a/test/Generics/archetype_with_redundant_superclass_conformance.swift +++ b/test/Generics/archetype_with_redundant_superclass_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-swift-frontend -emit-ir %s protocol P { associatedtype T : Q diff --git a/test/Generics/associated_type_typo.swift b/test/Generics/associated_type_typo.swift index 0880f618913..5a2cd7aa1d1 100644 --- a/test/Generics/associated_type_typo.swift +++ b/test/Generics/associated_type_typo.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on > %t.dump 2>&1 +// RUN: not %target-swift-frontend -typecheck -debug-generic-signatures %s > %t.dump 2>&1 // RUN: %FileCheck -check-prefix CHECK-GENERIC %s < %t.dump protocol P1 { diff --git a/test/Generics/associated_type_where_clause.swift b/test/Generics/associated_type_where_clause.swift index 1dc7fce8edb..d808f5a2a52 100644 --- a/test/Generics/associated_type_where_clause.swift +++ b/test/Generics/associated_type_where_clause.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -swift-version 4 -warn-redundant-requirements func needsSameType(_: T.Type, _: T.Type) {} diff --git a/test/Generics/canonical_concrete_substitutions_in_protocol.swift b/test/Generics/canonical_concrete_substitutions_in_protocol.swift index 66ab030a592..380a1479181 100644 --- a/test/Generics/canonical_concrete_substitutions_in_protocol.swift +++ b/test/Generics/canonical_concrete_substitutions_in_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s struct G {} diff --git a/test/Generics/canonicalization.swift b/test/Generics/canonicalization.swift index 212fbccfd1f..3798f7d6e44 100644 --- a/test/Generics/canonicalization.swift +++ b/test/Generics/canonicalization.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // rdar://problem/23149063 protocol P0 { } diff --git a/test/Generics/circular_protocol_superclass.swift b/test/Generics/circular_protocol_superclass.swift index d1ad9b54ad7..2a7330c2643 100644 --- a/test/Generics/circular_protocol_superclass.swift +++ b/test/Generics/circular_protocol_superclass.swift @@ -1,4 +1,4 @@ -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: circular_protocol_superclass.(file).A@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/concrete_conflict.swift b/test/Generics/concrete_conflict.swift index dc7608a02d3..27c9137db35 100644 --- a/test/Generics/concrete_conflict.swift +++ b/test/Generics/concrete_conflict.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck -verify %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { associatedtype T where T == Int diff --git a/test/Generics/concrete_conformance_minimization.swift b/test/Generics/concrete_conformance_minimization.swift index 0f47e3b069d..dc20bc37018 100644 --- a/test/Generics/concrete_conformance_minimization.swift +++ b/test/Generics/concrete_conformance_minimization.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s struct MyOptionSet : OptionSet { let rawValue: UInt diff --git a/test/Generics/concrete_conformance_rule_simplified.swift b/test/Generics/concrete_conformance_rule_simplified.swift index 5f372b4728c..63a159a35d0 100644 --- a/test/Generics/concrete_conformance_rule_simplified.swift +++ b/test/Generics/concrete_conformance_rule_simplified.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s protocol P1 {} diff --git a/test/Generics/concrete_contraction_substitute_non_nominal_base.swift b/test/Generics/concrete_contraction_substitute_non_nominal_base.swift index 1cea0c07eaa..d43530b2f1e 100644 --- a/test/Generics/concrete_contraction_substitute_non_nominal_base.swift +++ b/test/Generics/concrete_contraction_substitute_non_nominal_base.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P { associatedtype T : Q diff --git a/test/Generics/concrete_contraction_unrelated_typealias.swift b/test/Generics/concrete_contraction_unrelated_typealias.swift index 9541b3e98ba..7cfed60f8de 100644 --- a/test/Generics/concrete_contraction_unrelated_typealias.swift +++ b/test/Generics/concrete_contraction_unrelated_typealias.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -debug-generic-signatures -requirement-machine-inferred-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck -verify %s -debug-generic-signatures -warn-redundant-requirements 2>&1 | %FileCheck %s // Another GenericSignatureBuilder oddity, reduced from RxSwift. // diff --git a/test/Generics/concrete_nesting_elimination_order_2.swift b/test/Generics/concrete_nesting_elimination_order_2.swift index b0f84e65c4b..eac474a11c8 100644 --- a/test/Generics/concrete_nesting_elimination_order_2.swift +++ b/test/Generics/concrete_nesting_elimination_order_2.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s protocol P1 { associatedtype T diff --git a/test/Generics/concrete_redundancy_via_adjustment.swift b/test/Generics/concrete_redundancy_via_adjustment.swift index a5fe929ab9a..c61e85b9d97 100644 --- a/test/Generics/concrete_redundancy_via_adjustment.swift +++ b/test/Generics/concrete_redundancy_via_adjustment.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s struct G {} diff --git a/test/Generics/concrete_same_type_versus_anyobject.swift b/test/Generics/concrete_same_type_versus_anyobject.swift index a58a20c3e74..4acb5614aaf 100644 --- a/test/Generics/concrete_same_type_versus_anyobject.swift +++ b/test/Generics/concrete_same_type_versus_anyobject.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=on %s 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s struct S {} class C {} diff --git a/test/Generics/conditional_conformances.swift b/test/Generics/conditional_conformances.swift index 673cde4477c..196065c308c 100644 --- a/test/Generics/conditional_conformances.swift +++ b/test/Generics/conditional_conformances.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-inferred-signatures=on -warn-redundant-requirements > %t.dump 2>&1 +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements > %t.dump 2>&1 // RUN: %FileCheck %s < %t.dump protocol P1 {} diff --git a/test/Generics/conditional_requirement_inference_in_protocol.swift b/test/Generics/conditional_requirement_inference_in_protocol.swift index d9da2712359..fb825858dec 100644 --- a/test/Generics/conditional_requirement_inference_in_protocol.swift +++ b/test/Generics/conditional_requirement_inference_in_protocol.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // FIXME(rqm-diagnostics): The redundant conformance warnings here should not be emitted, since // these requirements participate in conditional requirement inference. diff --git a/test/Generics/confluent_example.swift b/test/Generics/confluent_example.swift index 692f0aa3359..0229f1e442f 100644 --- a/test/Generics/confluent_example.swift +++ b/test/Generics/confluent_example.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // The GSB crashes with P1 and P2, and rejects P3. diff --git a/test/Generics/conformance_access_path.swift b/test/Generics/conformance_access_path.swift index 10480c32704..a35dd7f9d3d 100644 --- a/test/Generics/conformance_access_path.swift +++ b/test/Generics/conformance_access_path.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -swift-version 4 -warn-redundant-requirements protocol P0 { } protocol Q0: P0 { } diff --git a/test/Generics/conformance_requirement_with_protocol_typealias.swift b/test/Generics/conformance_requirement_with_protocol_typealias.swift index 678936f11c5..c25917dde68 100644 --- a/test/Generics/conformance_requirement_with_protocol_typealias.swift +++ b/test/Generics/conformance_requirement_with_protocol_typealias.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: .P@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/connected_components_concrete.swift b/test/Generics/connected_components_concrete.swift index 4bbe1df4f89..9b5f143fed1 100644 --- a/test/Generics/connected_components_concrete.swift +++ b/test/Generics/connected_components_concrete.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-protocol-signatures=on %s 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s protocol P { associatedtype T diff --git a/test/Generics/derived_via_concrete.swift b/test/Generics/derived_via_concrete.swift index d60c32d6fba..2a6c3404132 100644 --- a/test/Generics/derived_via_concrete.swift +++ b/test/Generics/derived_via_concrete.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P {} class C {} diff --git a/test/Generics/derived_via_concrete_in_protocol.swift b/test/Generics/derived_via_concrete_in_protocol.swift index c7afdd567a0..f3658f49458 100644 --- a/test/Generics/derived_via_concrete_in_protocol.swift +++ b/test/Generics/derived_via_concrete_in_protocol.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -debug-generic-signatures -typecheck %s -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -debug-generic-signatures -typecheck %s 2>&1 | %FileCheck %s protocol P24 { associatedtype C: P20 diff --git a/test/Generics/generic_types.swift b/test/Generics/generic_types.swift index d687cca745d..44ebb69633e 100644 --- a/test/Generics/generic_types.swift +++ b/test/Generics/generic_types.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol MyFormattedPrintable { func myFormat() -> String diff --git a/test/Generics/identity_conformance.swift b/test/Generics/identity_conformance.swift index 5387ee876b2..ceecfff9179 100644 --- a/test/Generics/identity_conformance.swift +++ b/test/Generics/identity_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: identity_conformance.(file).P1@ // CHECK: Requirement signature: diff --git a/test/Generics/indirectly_concrete_generic_param.swift b/test/Generics/indirectly_concrete_generic_param.swift index cb163ff7f70..a148aa58c46 100644 --- a/test/Generics/indirectly_concrete_generic_param.swift +++ b/test/Generics/indirectly_concrete_generic_param.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class S where T : P, U == T.T {} diff --git a/test/Generics/infinite_concrete_type.swift b/test/Generics/infinite_concrete_type.swift index 35d206e2d4c..3ea75d155b3 100644 --- a/test/Generics/infinite_concrete_type.swift +++ b/test/Generics/infinite_concrete_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift class G {} diff --git a/test/Generics/inherited_concrete_conformance_in_protocol.swift b/test/Generics/inherited_concrete_conformance_in_protocol.swift index e5d259d52be..a2619991b18 100644 --- a/test/Generics/inherited_concrete_conformance_in_protocol.swift +++ b/test/Generics/inherited_concrete_conformance_in_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol Sequence {} diff --git a/test/Generics/interdependent_protocol_conformance_example_1.swift b/test/Generics/interdependent_protocol_conformance_example_1.swift index a76952b2fed..427ff87480a 100644 --- a/test/Generics/interdependent_protocol_conformance_example_1.swift +++ b/test/Generics/interdependent_protocol_conformance_example_1.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift %s -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift %s -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // The GenericSignatureBuilder was unable to derive the redundant conformance requirement 'B: P4' // in protocol P1. diff --git a/test/Generics/interdependent_protocol_conformance_example_2.swift b/test/Generics/interdependent_protocol_conformance_example_2.swift index 2882e99f590..4876ddd4ded 100644 --- a/test/Generics/interdependent_protocol_conformance_example_2.swift +++ b/test/Generics/interdependent_protocol_conformance_example_2.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift %s -requirement-machine-protocol-signatures=on -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // The GenericSignatureBuilder was unable to derive the redundant conformance requirement 'B: P4' // in protocol P1. diff --git a/test/Generics/interdependent_protocol_conformance_example_3.swift b/test/Generics/interdependent_protocol_conformance_example_3.swift index 53c6ae71596..88928ce8de8 100644 --- a/test/Generics/interdependent_protocol_conformance_example_3.swift +++ b/test/Generics/interdependent_protocol_conformance_example_3.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-reuse -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-reuse 2>&1 | %FileCheck %s // CHECK-LABEL: .NonEmptyProtocol@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/interdependent_protocol_conformance_example_4.swift b/test/Generics/interdependent_protocol_conformance_example_4.swift index f282bdfde40..320849b6786 100644 --- a/test/Generics/interdependent_protocol_conformance_example_4.swift +++ b/test/Generics/interdependent_protocol_conformance_example_4.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-reuse -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-reuse 2>&1 | %FileCheck %s // CHECK-LABEL: .NonEmptyProtocol@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/interdependent_protocol_conformance_example_5.swift b/test/Generics/interdependent_protocol_conformance_example_5.swift index 07057ec1086..5fd73eebc4b 100644 --- a/test/Generics/interdependent_protocol_conformance_example_5.swift +++ b/test/Generics/interdependent_protocol_conformance_example_5.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-reuse -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-reuse 2>&1 | %FileCheck %s // CHECK-LABEL: .NonEmptyProtocol@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/invalid.swift b/test/Generics/invalid.swift index 97f35ffead6..4ac99bb950a 100644 --- a/test/Generics/invalid.swift +++ b/test/Generics/invalid.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol he where A : B { // expected-error {{cannot find type 'A' in scope}} // expected-error@-1 {{cannot find type 'B' in scope}} diff --git a/test/Generics/joe_monoid.swift b/test/Generics/joe_monoid.swift index 2573baa2711..a5424bd51c0 100644 --- a/test/Generics/joe_monoid.swift +++ b/test/Generics/joe_monoid.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // This is a funny monoid presentation from Joe Groff. diff --git a/test/Generics/loop_normalization_1.swift b/test/Generics/loop_normalization_1.swift index 11bf2ea8dbb..63278e46dec 100644 --- a/test/Generics/loop_normalization_1.swift +++ b/test/Generics/loop_normalization_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P { associatedtype T diff --git a/test/Generics/loop_normalization_2.swift b/test/Generics/loop_normalization_2.swift index 55e2113103e..0fe6458a336 100644 --- a/test/Generics/loop_normalization_2.swift +++ b/test/Generics/loop_normalization_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { associatedtype A diff --git a/test/Generics/loop_normalization_performance.swift b/test/Generics/loop_normalization_performance.swift index dfeff438157..574c07847f5 100644 --- a/test/Generics/loop_normalization_performance.swift +++ b/test/Generics/loop_normalization_performance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift // This test was reduced from the NonEmpty open-source project; it motivated enabling // loop normalization by default, since without it, it takes too long to complete. diff --git a/test/Generics/minimal_conformances_compare_concrete.swift b/test/Generics/minimal_conformances_compare_concrete.swift index e482ce47826..a7b5d63a901 100644 --- a/test/Generics/minimal_conformances_compare_concrete.swift +++ b/test/Generics/minimal_conformances_compare_concrete.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction -dump-requirement-machine 2>&1 | %FileCheck %s --check-prefix=RULE +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s +// 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 protocol P {} diff --git a/test/Generics/minimize_concrete_unification.swift b/test/Generics/minimize_concrete_unification.swift index 4c53f044c2e..5a869e2af88 100644 --- a/test/Generics/minimize_concrete_unification.swift +++ b/test/Generics/minimize_concrete_unification.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s struct G {} diff --git a/test/Generics/minimize_superclass_unification_generic_1.swift b/test/Generics/minimize_superclass_unification_generic_1.swift index f4bac5acebc..f7e30a69126 100644 --- a/test/Generics/minimize_superclass_unification_generic_1.swift +++ b/test/Generics/minimize_superclass_unification_generic_1.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class A {} class B : A {} diff --git a/test/Generics/minimize_superclass_unification_generic_2.swift b/test/Generics/minimize_superclass_unification_generic_2.swift index f85ee442cb7..122c0d322de 100644 --- a/test/Generics/minimize_superclass_unification_generic_2.swift +++ b/test/Generics/minimize_superclass_unification_generic_2.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class A {} diff --git a/test/Generics/minimize_superclass_unification_non_generic.swift b/test/Generics/minimize_superclass_unification_non_generic.swift index 40e7ecaae95..400d4a48dea 100644 --- a/test/Generics/minimize_superclass_unification_non_generic.swift +++ b/test/Generics/minimize_superclass_unification_non_generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class A {} class B : A {} diff --git a/test/Generics/non_confluent.swift b/test/Generics/non_confluent.swift index 1c3f6c4f6f5..d0f9fbcc664 100644 --- a/test/Generics/non_confluent.swift +++ b/test/Generics/non_confluent.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol ABA // expected-error {{cannot build rewrite system for protocol; rule length limit exceeded}} // expected-note@-1 {{failed rewrite rule is [ABA:A].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:A] => [ABA:A].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B].[ABA:B]}} diff --git a/test/Generics/non_final_class_conforms_same_type_requirement_on_self.swift b/test/Generics/non_final_class_conforms_same_type_requirement_on_self.swift index d1abac67b03..249343b22a9 100644 --- a/test/Generics/non_final_class_conforms_same_type_requirement_on_self.swift +++ b/test/Generics/non_final_class_conforms_same_type_requirement_on_self.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=on %s 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction %s 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -disable-requirement-machine-concrete-contraction %s 2>&1 | %FileCheck %s public protocol P { associatedtype A : Q where A.B == Self diff --git a/test/Generics/opaque_archetype_concrete_requirement.swift b/test/Generics/opaque_archetype_concrete_requirement.swift index 37665794ca7..6740f806309 100644 --- a/test/Generics/opaque_archetype_concrete_requirement.swift +++ b/test/Generics/opaque_archetype_concrete_requirement.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -debug-generic-signatures -requirement-machine-inferred-signatures=on -enable-requirement-machine-opaque-archetypes 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -emit-silgen %s -disable-availability-checking -requirement-machine-inferred-signatures=on -enable-requirement-machine-opaque-archetypes +// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -debug-generic-signatures -enable-requirement-machine-opaque-archetypes 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-availability-checking -enable-requirement-machine-opaque-archetypes protocol P1 { associatedtype T : P2 diff --git a/test/Generics/opaque_archetype_concrete_requirement_invalid.swift b/test/Generics/opaque_archetype_concrete_requirement_invalid.swift index ee15acf94ab..3d99187534b 100644 --- a/test/Generics/opaque_archetype_concrete_requirement_invalid.swift +++ b/test/Generics/opaque_archetype_concrete_requirement_invalid.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -requirement-machine-inferred-signatures=on -enable-requirement-machine-opaque-archetypes +// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -enable-requirement-machine-opaque-archetypes protocol P1 {} diff --git a/test/Generics/opaque_archetype_concrete_requirement_recursive.swift b/test/Generics/opaque_archetype_concrete_requirement_recursive.swift index 477b95c0674..28d7f7e84ac 100644 --- a/test/Generics/opaque_archetype_concrete_requirement_recursive.swift +++ b/test/Generics/opaque_archetype_concrete_requirement_recursive.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -emit-silgen %s -disable-availability-checking -requirement-machine-inferred-signatures=on +// RUN: %target-swift-frontend -typecheck -verify %s -disable-availability-checking -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -emit-silgen %s -disable-availability-checking // FIXME: This does not work with -enable-requirement-machine-opaque-archetypes. // See opaque_archetype_concrete_requirement_rejected.swift for a demonstration diff --git a/test/Generics/opaque_archetype_concrete_requirement_recursive_rejected.swift b/test/Generics/opaque_archetype_concrete_requirement_recursive_rejected.swift index 0fffcf36677..b8179a44bc8 100644 --- a/test/Generics/opaque_archetype_concrete_requirement_recursive_rejected.swift +++ b/test/Generics/opaque_archetype_concrete_requirement_recursive_rejected.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -requirement-machine-inferred-signatures=on -enable-requirement-machine-opaque-archetypes +// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-requirement-machine-opaque-archetypes // FIXME: This does not work with -enable-requirement-machine-opaque-archetypes. // See opaque_archetype_concrete_requirement_recursive.swift for a demonstration diff --git a/test/Generics/protocol_order.swift b/test/Generics/protocol_order.swift index f4dc689b915..bd8b5e0b4b9 100644 --- a/test/Generics/protocol_order.swift +++ b/test/Generics/protocol_order.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { associatedtype T diff --git a/test/Generics/protocol_requirement_signatures.swift b/test/Generics/protocol_requirement_signatures.swift index e4ad730f827..10f7c9776ea 100644 --- a/test/Generics/protocol_requirement_signatures.swift +++ b/test/Generics/protocol_requirement_signatures.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on -warn-redundant-requirements > %t.dump 2>&1 +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements > %t.dump 2>&1 // RUN: %FileCheck %s < %t.dump // CHECK-LABEL: .P1@ diff --git a/test/Generics/protocol_self_concrete_error.swift b/test/Generics/protocol_self_concrete_error.swift index d08af5f1fd9..5c4e0afec0f 100644 --- a/test/Generics/protocol_self_concrete_error.swift +++ b/test/Generics/protocol_self_concrete_error.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -disable-requirement-machine-concrete-contraction +// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -disable-requirement-machine-concrete-contraction // This triggered a Requirement Machine assertion because the permanent // 'identity conformance' rule ([P].[P] => [P]) was the source of the diff --git a/test/Generics/protocol_type_aliases.swift b/test/Generics/protocol_type_aliases.swift index ca2a6aaf3ca..aea68594cbe 100644 --- a/test/Generics/protocol_type_aliases.swift +++ b/test/Generics/protocol_type_aliases.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on > %t.dump 2>&1 +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures > %t.dump 2>&1 func sameType(_: T.Type, _: T.Type) {} diff --git a/test/Generics/protocol_typealias_concrete_unification.swift b/test/Generics/protocol_typealias_concrete_unification.swift index 148e1cf3ac9..b10d98cdadc 100644 --- a/test/Generics/protocol_typealias_concrete_unification.swift +++ b/test/Generics/protocol_typealias_concrete_unification.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { typealias T = Array diff --git a/test/Generics/protocol_typealias_cycle_3.swift b/test/Generics/protocol_typealias_cycle_3.swift index e48825e82d4..0ec19f3a385 100644 --- a/test/Generics/protocol_typealias_cycle_3.swift +++ b/test/Generics/protocol_typealias_cycle_3.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -requirement-machine-protocol-signatures=on +// RUN: %target-swift-frontend -typecheck %s protocol P { typealias MyFunction = diff --git a/test/Generics/protocol_typealias_cycle_4.swift b/test/Generics/protocol_typealias_cycle_4.swift index 418b3ede671..ae10568a186 100644 --- a/test/Generics/protocol_typealias_cycle_4.swift +++ b/test/Generics/protocol_typealias_cycle_4.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: .P@ // CHECK-NEXT: Requirement signature: > diff --git a/test/Generics/protocol_typealias_cycle_5.swift b/test/Generics/protocol_typealias_cycle_5.swift index 5b75228eeff..742bcf61c13 100644 --- a/test/Generics/protocol_typealias_cycle_5.swift +++ b/test/Generics/protocol_typealias_cycle_5.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P : Sequence { typealias Element = Iterator.Element diff --git a/test/Generics/protocol_typealias_redeclaration.swift b/test/Generics/protocol_typealias_redeclaration.swift index e09262c518e..25bc4c9e453 100644 --- a/test/Generics/protocol_typealias_redeclaration.swift +++ b/test/Generics/protocol_typealias_redeclaration.swift @@ -1,4 +1,4 @@ -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: .P@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/protocol_typealias_serialization.swift b/test/Generics/protocol_typealias_serialization.swift index 6194bdb5c51..211e512e710 100644 --- a/test/Generics/protocol_typealias_serialization.swift +++ b/test/Generics/protocol_typealias_serialization.swift @@ -1,6 +1,6 @@ // RUN: %empty-directory(%t) -// RUN: %target-swift-frontend -emit-module %S/Inputs/protocol_typealias_other.swift -emit-module-path %t/protocol_typealias_other.swiftmodule -module-name protocol_typealias_other -requirement-machine-protocol-signatures=on -// RUN: %target-swift-frontend -typecheck %s -I %t -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -emit-module %S/Inputs/protocol_typealias_other.swift -emit-module-path %t/protocol_typealias_other.swiftmodule -module-name protocol_typealias_other +// RUN: %target-swift-frontend -typecheck %s -I %t -debug-generic-signatures 2>&1 | %FileCheck %s import protocol_typealias_other diff --git a/test/Generics/rdar25065503.swift b/test/Generics/rdar25065503.swift index 359a80f73d1..9da0cd26850 100644 --- a/test/Generics/rdar25065503.swift +++ b/test/Generics/rdar25065503.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class Base {} class Derived : Base {} diff --git a/test/Generics/rdar28544316.swift b/test/Generics/rdar28544316.swift index 31137c92f12..a9e26204440 100644 --- a/test/Generics/rdar28544316.swift +++ b/test/Generics/rdar28544316.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend %s -emit-ir -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend %s -emit-ir -debug-generic-signatures 2>&1 | %FileCheck %s // REQUIRES: asserts class PropertyDataSource { diff --git a/test/Generics/rdar33654588.swift b/test/Generics/rdar33654588.swift index ecd91497bf9..9a3f5baa687 100644 --- a/test/Generics/rdar33654588.swift +++ b/test/Generics/rdar33654588.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on 2>&1 +// RUN: %target-typecheck-verify-swift 2>&1 protocol FP {} diff --git a/test/Generics/rdar51908331.swift b/test/Generics/rdar51908331.swift index a574eb05c06..74edf34e56f 100644 --- a/test/Generics/rdar51908331.swift +++ b/test/Generics/rdar51908331.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -requirement-machine-abstract-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // Reduced from https://github.com/plx/HDXLSIMDSupport. diff --git a/test/Generics/rdar62903491.swift b/test/Generics/rdar62903491.swift index a2b08a34388..6d57308adef 100644 --- a/test/Generics/rdar62903491.swift +++ b/test/Generics/rdar62903491.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s protocol P { associatedtype X : P diff --git a/test/Generics/rdar65015626.swift b/test/Generics/rdar65015626.swift index dc80a4bbc9b..5f70ba38628 100644 --- a/test/Generics/rdar65015626.swift +++ b/test/Generics/rdar65015626.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: 65015626.(file).G@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar65263302.swift b/test/Generics/rdar65263302.swift index 504ec852251..772b6a8367b 100644 --- a/test/Generics/rdar65263302.swift +++ b/test/Generics/rdar65263302.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -verify -emit-ir %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -verify -emit-ir %s -warn-redundant-requirements public protocol P { associatedtype Element diff --git a/test/Generics/rdar68084643.swift b/test/Generics/rdar68084643.swift index 3b180da31cf..2255e04ac70 100644 --- a/test/Generics/rdar68084643.swift +++ b/test/Generics/rdar68084643.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: 68084643.(file).R@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar74890907.swift b/test/Generics/rdar74890907.swift index 85244c2e3bf..c2fa4ebe086 100644 --- a/test/Generics/rdar74890907.swift +++ b/test/Generics/rdar74890907.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -warn-redundant-requirements 2>&1 | %FileCheck %s protocol P1 { associatedtype A : P2 diff --git a/test/Generics/rdar75656022.swift b/test/Generics/rdar75656022.swift index 0d8267fbe3f..f56276b66d7 100644 --- a/test/Generics/rdar75656022.swift +++ b/test/Generics/rdar75656022.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s protocol P1 { associatedtype T diff --git a/test/Generics/rdar77462797.swift b/test/Generics/rdar77462797.swift index 1665026519e..319294781bc 100644 --- a/test/Generics/rdar77462797.swift +++ b/test/Generics/rdar77462797.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P {} diff --git a/test/Generics/rdar77683844.swift b/test/Generics/rdar77683844.swift index 22dc9e7608c..5e25e9cb867 100644 --- a/test/Generics/rdar77683844.swift +++ b/test/Generics/rdar77683844.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: rdar77683844.(file).P1@ // CHECK-LABEL: Requirement signature: diff --git a/test/Generics/rdar78233378.swift b/test/Generics/rdar78233378.swift index 90b66dc1d2e..2a8fe2b9c56 100644 --- a/test/Generics/rdar78233378.swift +++ b/test/Generics/rdar78233378.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: rdar78233378.(file).P1@ // CHECK-LABEL: Requirement signature: diff --git a/test/Generics/rdar78643612.swift b/test/Generics/rdar78643612.swift index 96d2163a7b2..574f68207ef 100644 --- a/test/Generics/rdar78643612.swift +++ b/test/Generics/rdar78643612.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: 78643612.(file).Z1@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar80503090.swift b/test/Generics/rdar80503090.swift index e6a3d7636ff..6d3f1f34452 100644 --- a/test/Generics/rdar80503090.swift +++ b/test/Generics/rdar80503090.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s protocol P { associatedtype T where T == Self diff --git a/test/Generics/rdar83308672.swift b/test/Generics/rdar83308672.swift index 0ea79206a88..9b23a3e88c2 100644 --- a/test/Generics/rdar83308672.swift +++ b/test/Generics/rdar83308672.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements 2>&1 | %FileCheck %s // CHECK: rdar83308672.(file).A@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar83687967.swift b/test/Generics/rdar83687967.swift index 2407cecacab..cfe9a2917e7 100644 --- a/test/Generics/rdar83687967.swift +++ b/test/Generics/rdar83687967.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s // RUN: %target-swift-frontend -emit-ir %s public protocol P1 {} diff --git a/test/Generics/rdar83848546.swift b/test/Generics/rdar83848546.swift index e219edb2838..87db0ce3914 100644 --- a/test/Generics/rdar83848546.swift +++ b/test/Generics/rdar83848546.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: 83848546.(file).Reporter@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar83955123.swift b/test/Generics/rdar83955123.swift index 91ba3dd71bb..b22affe5f14 100644 --- a/test/Generics/rdar83955123.swift +++ b/test/Generics/rdar83955123.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: rdar83955123.(file).Cyclo@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar86431977.swift b/test/Generics/rdar86431977.swift index 7fc489503b2..cd59ce66e0d 100644 --- a/test/Generics/rdar86431977.swift +++ b/test/Generics/rdar86431977.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { associatedtype A diff --git a/test/Generics/rdar90506457.swift b/test/Generics/rdar90506457.swift index bed830d9cb2..89326e34f6e 100644 --- a/test/Generics/rdar90506457.swift +++ b/test/Generics/rdar90506457.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: .P1@ // CHECK-NEXT: Requirement signature: > diff --git a/test/Generics/rdar90506460.swift b/test/Generics/rdar90506460.swift index d42c572b759..f049b217794 100644 --- a/test/Generics/rdar90506460.swift +++ b/test/Generics/rdar90506460.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: .P1@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/rdar91594361.swift b/test/Generics/rdar91594361.swift index b73e7c254c8..642066faa9f 100644 --- a/test/Generics/rdar91594361.swift +++ b/test/Generics/rdar91594361.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { associatedtype T diff --git a/test/Generics/reconstitute_sugar.swift b/test/Generics/reconstitute_sugar.swift index 1a08c9f252c..a1c1256ce88 100644 --- a/test/Generics/reconstitute_sugar.swift +++ b/test/Generics/reconstitute_sugar.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // The Requirement Machine works with canonical types internally, so make sure // we reconstitute sugar in trivial cases before surfacing the generic diff --git a/test/Generics/redundant_concrete_conformance.swift b/test/Generics/redundant_concrete_conformance.swift index 505124dc0f4..f75e4544a1d 100644 --- a/test/Generics/redundant_concrete_conformance.swift +++ b/test/Generics/redundant_concrete_conformance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P1 {} protocol P2 : P1 {} diff --git a/test/Generics/redundant_parent_path_in_protocol.swift b/test/Generics/redundant_parent_path_in_protocol.swift index 2cc19f6af4c..8d2df730fb1 100644 --- a/test/Generics/redundant_parent_path_in_protocol.swift +++ b/test/Generics/redundant_parent_path_in_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: redundant_parent_path_in_protocol.(file).P1@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/redundant_protocol_composition.swift b/test/Generics/redundant_protocol_composition.swift index 2c98d71b27f..84be2445cbe 100644 --- a/test/Generics/redundant_protocol_composition.swift +++ b/test/Generics/redundant_protocol_composition.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // The GenericSignatureBuilder did not diagnose the first two. diff --git a/test/Generics/redundant_protocol_inheritance_via_concrete.swift b/test/Generics/redundant_protocol_inheritance_via_concrete.swift index ac495233ad7..bf034514186 100644 --- a/test/Generics/redundant_protocol_inheritance_via_concrete.swift +++ b/test/Generics/redundant_protocol_inheritance_via_concrete.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P {} class C : P {} diff --git a/test/Generics/redundant_protocol_refinement.swift b/test/Generics/redundant_protocol_refinement.swift index 7599134ee98..abb5faeaa7d 100644 --- a/test/Generics/redundant_protocol_refinement.swift +++ b/test/Generics/redundant_protocol_refinement.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-protocol-signatures=on %s 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s // CHECK-LABEL: redundant_protocol_refinement.(file).Base@ // CHECK-LABEL: Requirement signature: diff --git a/test/Generics/redundant_requirement_self_conforming_protocol.swift b/test/Generics/redundant_requirement_self_conforming_protocol.swift index b2442c5c2b2..9472c8eeefc 100644 --- a/test/Generics/redundant_requirement_self_conforming_protocol.swift +++ b/test/Generics/redundant_requirement_self_conforming_protocol.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s struct G {} diff --git a/test/Generics/requirement_inference.swift b/test/Generics/requirement_inference.swift index 0a3317d279f..0b553076dde 100644 --- a/test/Generics/requirement_inference.swift +++ b/test/Generics/requirement_inference.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { func p1() diff --git a/test/Generics/requirement_inference_funny_order.swift b/test/Generics/requirement_inference_funny_order.swift index 48bf0b87a29..3157292960b 100644 --- a/test/Generics/requirement_inference_funny_order.swift +++ b/test/Generics/requirement_inference_funny_order.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 {} diff --git a/test/Generics/requirement_machine_diagnostics.swift b/test/Generics/requirement_machine_diagnostics.swift index 7d762a6d45a..abd014ec64a 100644 --- a/test/Generics/requirement_machine_diagnostics.swift +++ b/test/Generics/requirement_machine_diagnostics.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements func testInvalidConformance() { // expected-error@+1 {{type 'T' constrained to non-protocol, non-class type 'Int'}} diff --git a/test/Generics/same_type_constraints.swift b/test/Generics/same_type_constraints.swift index d171983a323..cd2a9b5e0c6 100644 --- a/test/Generics/same_type_constraints.swift +++ b/test/Generics/same_type_constraints.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -swift-version 4 -warn-redundant-requirements protocol Fooable { associatedtype Foo diff --git a/test/Generics/same_type_minimize_concrete.swift b/test/Generics/same_type_minimize_concrete.swift index 355ad212b70..5b0e14c1c52 100644 --- a/test/Generics/same_type_minimize_concrete.swift +++ b/test/Generics/same_type_minimize_concrete.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-inferred-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements 2>&1 | %FileCheck %s struct G { } diff --git a/test/Generics/same_type_requirements_in_protocol.swift b/test/Generics/same_type_requirements_in_protocol.swift index 48ba871649a..ec058015666 100644 --- a/test/Generics/same_type_requirements_in_protocol.swift +++ b/test/Generics/same_type_requirements_in_protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -requirement-machine-protocol-signatures=on -debug-generic-signatures 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: same_type_requirements_in_protocol.(file).P1@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/simplify_concrete_substitutions.swift b/test/Generics/simplify_concrete_substitutions.swift index 5159706888c..5d68129c601 100644 --- a/test/Generics/simplify_concrete_substitutions.swift +++ b/test/Generics/simplify_concrete_substitutions.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // The rule // diff --git a/test/Generics/simplify_concrete_substitutions_projection.swift b/test/Generics/simplify_concrete_substitutions_projection.swift index 74d421bbf48..c9bca42b8b7 100644 --- a/test/Generics/simplify_concrete_substitutions_projection.swift +++ b/test/Generics/simplify_concrete_substitutions_projection.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s struct G {} diff --git a/test/Generics/simplify_rhs_elimination_order.swift b/test/Generics/simplify_rhs_elimination_order.swift index d4491af27a1..c00d2409ec6 100644 --- a/test/Generics/simplify_rhs_elimination_order.swift +++ b/test/Generics/simplify_rhs_elimination_order.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s public protocol P1 { associatedtype T diff --git a/test/Generics/split_concrete_equivalence_class.swift b/test/Generics/split_concrete_equivalence_class.swift index 646df211990..a13f5c6b6dd 100644 --- a/test/Generics/split_concrete_equivalence_class.swift +++ b/test/Generics/split_concrete_equivalence_class.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: split_concrete_equivalence_class.(file).f01@ // CHECK-NEXT: Generic signature: diff --git a/test/Generics/sr10438.swift b/test/Generics/sr10438.swift index eb8e8dd1e79..6bbb873e48e 100644 --- a/test/Generics/sr10438.swift +++ b/test/Generics/sr10438.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: sr10438.(file).AuthenticationFlowStateMachine@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr10532.swift b/test/Generics/sr10532.swift index 60939595f8e..704def2b03a 100644 --- a/test/Generics/sr10532.swift +++ b/test/Generics/sr10532.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: sr10532.(file).ScalarProtocol@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr10752.swift b/test/Generics/sr10752.swift index 5a81c34a730..a7b1fedaf5e 100644 --- a/test/Generics/sr10752.swift +++ b/test/Generics/sr10752.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements 2>&1 | %FileCheck %s // CHECK: sr10752.(file).P@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr11100.swift b/test/Generics/sr11100.swift index e7a3e1b26eb..2c931deb414 100644 --- a/test/Generics/sr11100.swift +++ b/test/Generics/sr11100.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { associatedtype A diff --git a/test/Generics/sr11153.swift b/test/Generics/sr11153.swift index c6f14fc7233..60142ae245c 100644 --- a/test/Generics/sr11153.swift +++ b/test/Generics/sr11153.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-protocol-signatures=on %s 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -emit-ir -requirement-machine-protocol-signatures=on %s +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s // CHECK: Requirement signature: public protocol VectorSpace { diff --git a/test/Generics/sr11997.swift b/test/Generics/sr11997.swift index ae2a959067b..76b4dd4ca59 100644 --- a/test/Generics/sr11997.swift +++ b/test/Generics/sr11997.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: sr11997.(file).A@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr12120.swift b/test/Generics/sr12120.swift index 0ec39702aad..80c05d2be57 100644 --- a/test/Generics/sr12120.swift +++ b/test/Generics/sr12120.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements 2>&1 | %FileCheck %s // CHECK: sr12120.(file).Swappable1@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr12736.swift b/test/Generics/sr12736.swift index 7f1b2d7d4e9..d186a455ab9 100644 --- a/test/Generics/sr12736.swift +++ b/test/Generics/sr12736.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: sr12736.(file).ColorModel@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr12980.swift b/test/Generics/sr12980.swift index 5d8ca4ece39..ac46793db42 100644 --- a/test/Generics/sr12980.swift +++ b/test/Generics/sr12980.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol VectorIndex : CaseIterable {} diff --git a/test/Generics/sr13850.swift b/test/Generics/sr13850.swift index 31acce17229..0f6ba8e5dc0 100644 --- a/test/Generics/sr13850.swift +++ b/test/Generics/sr13850.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // https://bugs.swift.org/browse/SR-13850 diff --git a/test/Generics/sr14485.swift b/test/Generics/sr14485.swift index 706ac2e8303..51aa37c6478 100644 --- a/test/Generics/sr14485.swift +++ b/test/Generics/sr14485.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on -warn-redundant-requirements 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures -warn-redundant-requirements 2>&1 | %FileCheck %s // CHECK: sr14485.(file).P@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr14510.swift b/test/Generics/sr14510.swift index 78fb497cf67..b8856578613 100644 --- a/test/Generics/sr14510.swift +++ b/test/Generics/sr14510.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -debug-generic-signatures -typecheck %s -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -debug-generic-signatures -typecheck %s 2>&1 | %FileCheck %s // CHECK-LABEL: Requirement signature: public protocol Adjoint { diff --git a/test/Generics/sr14580.swift b/test/Generics/sr14580.swift index 374b1e70a7e..39664921149 100644 --- a/test/Generics/sr14580.swift +++ b/test/Generics/sr14580.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-protocol-signatures=on %s 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s public protocol ScalarProtocol: ScalarMultiplicative where Self == Scalar { } diff --git a/test/Generics/sr14917.swift b/test/Generics/sr14917.swift index 632cb837067..186f8951848 100644 --- a/test/Generics/sr14917.swift +++ b/test/Generics/sr14917.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P { associatedtype A diff --git a/test/Generics/sr15009.swift b/test/Generics/sr15009.swift index 481f91160ad..bf38fb63304 100644 --- a/test/Generics/sr15009.swift +++ b/test/Generics/sr15009.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK: sr15009.(file).P@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr15790.swift b/test/Generics/sr15790.swift index b8011fafb32..a71798f9d64 100644 --- a/test/Generics/sr15790.swift +++ b/test/Generics/sr15790.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: sr15790.(file).P1@ // CHECK-NEXT: Requirement signature: diff --git a/test/Generics/sr15826.swift b/test/Generics/sr15826.swift index 0b787f1562b..d1e60474a3e 100644 --- a/test/Generics/sr15826.swift +++ b/test/Generics/sr15826.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol AProtocol { associatedtype B: BProtocol where B.A == Self diff --git a/test/Generics/sr16024.swift b/test/Generics/sr16024.swift index 06b9bdba591..986252e8f1f 100644 --- a/test/Generics/sr16024.swift +++ b/test/Generics/sr16024.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -requirement-machine-protocol-signatures=on +// RUN: %target-swift-frontend -typecheck %s // The rule length limit (12 by default) is relative to the longest initial rule. diff --git a/test/Generics/sr5726.swift b/test/Generics/sr5726.swift index acb153df173..98195e3746b 100644 --- a/test/Generics/sr5726.swift +++ b/test/Generics/sr5726.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // SR-5726 protocol Foo diff --git a/test/Generics/sr7353.swift b/test/Generics/sr7353.swift index e7aee1438d2..8ee2ba82002 100644 --- a/test/Generics/sr7353.swift +++ b/test/Generics/sr7353.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: sr7353.(file).P@ // CHECK-LABEL: diff --git a/test/Generics/sr8968.swift b/test/Generics/sr8968.swift index b84cdd2c5ce..2909fae3cb1 100644 --- a/test/Generics/sr8968.swift +++ b/test/Generics/sr8968.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s public class OFMAttachment : NativeInserting { // expected-warning@-1 {{non-final class 'OFMAttachment' cannot safely conform to protocol 'NativeInserting', which requires that 'Self.SnapshotType.NativeType' is exactly equal to 'Self'; this is an error in Swift 6}} diff --git a/test/Generics/sr9595.swift b/test/Generics/sr9595.swift index 81ddc411314..89dd3355286 100644 --- a/test/Generics/sr9595.swift +++ b/test/Generics/sr9595.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -debug-generic-signatures -requirement-machine-protocol-signatures=on -typecheck %s 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -debug-generic-signatures -typecheck %s 2>&1 | %FileCheck %s protocol R {} diff --git a/test/Generics/superclass_and_concrete_requirement.swift b/test/Generics/superclass_and_concrete_requirement.swift index a091072a386..24edc5bce07 100644 --- a/test/Generics/superclass_and_concrete_requirement.swift +++ b/test/Generics/superclass_and_concrete_requirement.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class C {} diff --git a/test/Generics/superclass_and_layout_requirement.swift b/test/Generics/superclass_and_layout_requirement.swift index 540219c1f8a..56179869f6b 100644 --- a/test/Generics/superclass_and_layout_requirement.swift +++ b/test/Generics/superclass_and_layout_requirement.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class C {} diff --git a/test/Generics/superclass_constraint.swift b/test/Generics/superclass_constraint.swift index 26b2736101f..4ca725dfc00 100644 --- a/test/Generics/superclass_constraint.swift +++ b/test/Generics/superclass_constraint.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on > %t.dump 2>&1 +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures > %t.dump 2>&1 // RUN: %FileCheck %s < %t.dump class A { diff --git a/test/Generics/trivial_reduction.swift b/test/Generics/trivial_reduction.swift index af02f62d388..219ceaca0ca 100644 --- a/test/Generics/trivial_reduction.swift +++ b/test/Generics/trivial_reduction.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s // CHECK-LABEL: trivial_reduction.(file).P1@ // CHECK-LABEL: Requirement signature: diff --git a/test/Generics/unify_protocol_composition.swift b/test/Generics/unify_protocol_composition.swift index 48e3f8769f1..ddeca7420bb 100644 --- a/test/Generics/unify_protocol_composition.swift +++ b/test/Generics/unify_protocol_composition.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s class C {} diff --git a/test/Generics/validate_stdlib_generic_signatures.swift b/test/Generics/validate_stdlib_generic_signatures.swift index fc43d7d2d02..8c102416346 100644 --- a/test/Generics/validate_stdlib_generic_signatures.swift +++ b/test/Generics/validate_stdlib_generic_signatures.swift @@ -1,4 +1,4 @@ // Verifies that all of the generic signatures in the standard library are // minimal and canonical. -// RUN: %target-typecheck-verify-swift -verify-generic-signatures Swift -requirement-machine-abstract-signatures=on +// RUN: %target-typecheck-verify-swift -verify-generic-signatures Swift diff --git a/test/Generics/where_clause_contextually_generic_decls.swift b/test/Generics/where_clause_contextually_generic_decls.swift index 69623fd7617..f925e17f7e2 100644 --- a/test/Generics/where_clause_contextually_generic_decls.swift +++ b/test/Generics/where_clause_contextually_generic_decls.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -swift-version 4 func bet() where A : B {} // expected-error {{'where' clause cannot be applied to a non-generic top-level declaration}} diff --git a/test/IDE/print_ast_tc_decls_errors.swift b/test/IDE/print_ast_tc_decls_errors.swift index b423165e6c4..6a09223a138 100644 --- a/test/IDE/print_ast_tc_decls_errors.swift +++ b/test/IDE/print_ast_tc_decls_errors.swift @@ -1,6 +1,6 @@ // Verify errors in this file to ensure that parse and type checker errors // occur where we expect them. -// RUN: %target-typecheck-verify-swift -show-diagnostics-after-fatal -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -show-diagnostics-after-fatal // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename %s -prefer-type-repr=false > %t.printed.txt // RUN: %FileCheck %s -strict-whitespace < %t.printed.txt diff --git a/test/Interpreter/polymorphic_builtins.swift b/test/Interpreter/polymorphic_builtins.swift index 1de8965ac04..87774e32076 100644 --- a/test/Interpreter/polymorphic_builtins.swift +++ b/test/Interpreter/polymorphic_builtins.swift @@ -7,20 +7,20 @@ // RUN: %empty-directory(%t) -// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -parse-stdlib -D DEBUG -Onone -Xfrontend -requirement-machine-protocol-signatures=on +// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -parse-stdlib -D DEBUG -Onone // RUN: %target-codesign %t/%target-library-name(mysimd) -// RUN: %target-build-swift %s -L %t -I %t -lmysimd -parse-stdlib -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -D DEBUG -Onone -Xfrontend -requirement-machine-protocol-signatures=on +// RUN: %target-build-swift %s -L %t -I %t -lmysimd -parse-stdlib -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -D DEBUG -Onone // RUN: %target-codesign %t/a.out // RUN: %target-run %t/a.out %t/%target-library-name(mysimd) // RUN: %empty-directory(%t) -// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -parse-stdlib -O -Xfrontend -requirement-machine-protocol-signatures=on +// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -parse-stdlib -O // RUN: %target-codesign %t/%target-library-name(mysimd) -// RUN: %target-build-swift %s -L %t -I %t -lmysimd -parse-stdlib -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -O -Xfrontend -requirement-machine-protocol-signatures=on +// RUN: %target-build-swift %s -L %t -I %t -lmysimd -parse-stdlib -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -O // RUN: %target-codesign %t/a.out // RUN: %target-run %t/a.out %t/%target-library-name(mysimd) diff --git a/test/ModuleInterface/access-filter.swift b/test/ModuleInterface/access-filter.swift index 809bab43ad8..d616ad5aef8 100644 --- a/test/ModuleInterface/access-filter.swift +++ b/test/ModuleInterface/access-filter.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name AccessFilter -requirement-machine-inferred-signatures=on +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name AccessFilter // RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name AccessFilter // RUN: %FileCheck %s < %t.swiftinterface // RUN: %FileCheck -check-prefix NEGATIVE %s < %t.swiftinterface diff --git a/test/ModuleInterface/specialized-extension.swift b/test/ModuleInterface/specialized-extension.swift index 15b87f4677d..78d3b440c72 100644 --- a/test/ModuleInterface/specialized-extension.swift +++ b/test/ModuleInterface/specialized-extension.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name Test -enable-experimental-bound-generic-extensions -requirement-machine-inferred-signatures=on +// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name Test -enable-experimental-bound-generic-extensions // RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name Test // RUN: %FileCheck %s < %t.swiftinterface diff --git a/test/Parse/deprecated_where.swift b/test/Parse/deprecated_where.swift index 546b45d73ed..8878b385df1 100644 --- a/test/Parse/deprecated_where.swift +++ b/test/Parse/deprecated_where.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -swift-version 4 protocol Mashable { } protocol Womparable { } diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift index 3c88a46291d..532f926bffb 100644 --- a/test/Prototypes/BigInt.swift +++ b/test/Prototypes/BigInt.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// // RUN: %empty-directory(%t) -// RUN: %target-build-swift -swift-version 4 -o %t/a.out %s -Xfrontend -requirement-machine-inferred-signatures=on -Xfrontend -requirement-machine-abstract-signatures=on -Xfrontend -requirement-machine-protocol-signatures=on +// RUN: %target-build-swift -swift-version 4 -o %t/a.out %s // RUN: %target-codesign %t/a.out // RUN: %target-run %t/a.out // REQUIRES: executable_test diff --git a/test/SILGen/class_conforms_with_default_concrete_self.swift b/test/SILGen/class_conforms_with_default_concrete_self.swift index ae216dc88de..f14e18cc394 100644 --- a/test/SILGen/class_conforms_with_default_concrete_self.swift +++ b/test/SILGen/class_conforms_with_default_concrete_self.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-silgen %s -requirement-machine-abstract-signatures=on | %FileCheck %s +// RUN: %target-swift-emit-silgen %s | %FileCheck %s public protocol P { associatedtype A : Q where A.B == Self diff --git a/test/SILGen/protocol_superclass_cycle.swift b/test/SILGen/protocol_superclass_cycle.swift index 35d9c0466d8..fcd42f01605 100644 --- a/test/SILGen/protocol_superclass_cycle.swift +++ b/test/SILGen/protocol_superclass_cycle.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-silgen -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on %s +// RUN: %target-swift-frontend -emit-silgen %s // When a protocol has a superclass requirement on 'Self' and the class // itself conforms concretely, the forwarding substitution map will have diff --git a/test/SILGen/subclass_existentials.swift b/test/SILGen/subclass_existentials.swift index a9f855e18fc..7d0b2be375c 100644 --- a/test/SILGen/subclass_existentials.swift +++ b/test/SILGen/subclass_existentials.swift @@ -1,6 +1,6 @@ -// RUN: %target-swift-emit-silgen -module-name subclass_existentials -Xllvm -sil-full-demangle -parse-as-library -primary-file %s -verify -requirement-machine-abstract-signatures=on | %FileCheck %s -// RUN: %target-swift-emit-ir -module-name subclass_existentials -parse-as-library -primary-file %s -requirement-machine-abstract-signatures=on +// RUN: %target-swift-emit-silgen -module-name subclass_existentials -Xllvm -sil-full-demangle -parse-as-library -primary-file %s -verify | %FileCheck %s +// RUN: %target-swift-emit-ir -module-name subclass_existentials -parse-as-library -primary-file %s // Note: we pass -verify above to ensure there are no spurious // compiler warnings relating to casts. diff --git a/test/SILGen/type_lowering_subst_function_type_caseiterable.swift b/test/SILGen/type_lowering_subst_function_type_caseiterable.swift index f1fbb4b4c07..e7a2b5639c4 100644 --- a/test/SILGen/type_lowering_subst_function_type_caseiterable.swift +++ b/test/SILGen/type_lowering_subst_function_type_caseiterable.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-emit-silgen %s -requirement-machine-abstract-signatures=on | %FileCheck %s +// RUN: %target-swift-emit-silgen %s | %FileCheck %s // This is a GenericSignatureBuilder bug fixed with the Requirement Machine, from // https://bugs.swift.org/browse/SR-15917. diff --git a/test/Serialization/Recovery/typedefs.swift b/test/Serialization/Recovery/typedefs.swift index 5aaa8f84bab..70fd6a4f076 100644 --- a/test/Serialization/Recovery/typedefs.swift +++ b/test/Serialization/Recovery/typedefs.swift @@ -2,7 +2,7 @@ // Cannot use -parse-as-library here because that would compile also the // #if VERIFY path, which contains top-level code. -// RUN: %target-swift-frontend -emit-sil -o - -emit-module-path %t/Lib.swiftmodule -module-name Lib -I %S/Inputs/custom-modules -disable-objc-attr-requires-foundation-module -enable-objc-interop %s -requirement-machine-inferred-signatures=on | %FileCheck -check-prefix CHECK-VTABLE %s +// RUN: %target-swift-frontend -emit-sil -o - -emit-module-path %t/Lib.swiftmodule -module-name Lib -I %S/Inputs/custom-modules -disable-objc-attr-requires-foundation-module -enable-objc-interop %s | %FileCheck -check-prefix CHECK-VTABLE %s // RUN: %target-swift-ide-test -source-filename=x -print-module -module-to-print Lib -I %t -I %S/Inputs/custom-modules | %FileCheck %s diff --git a/test/attr/accessibility_where_clause.swift b/test/attr/accessibility_where_clause.swift index 72fd301fcd1..86e76ece52a 100644 --- a/test/attr/accessibility_where_clause.swift +++ b/test/attr/accessibility_where_clause.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift public class OuterClass { class InnerClass {} diff --git a/test/attr/attr_specialize.swift b/test/attr/attr_specialize.swift index 595514d1f4a..e33f79935fc 100644 --- a/test/attr/attr_specialize.swift +++ b/test/attr/attr_specialize.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // RUN: %target-swift-ide-test -print-ast-typechecked -source-filename=%s -disable-objc-attr-requires-foundation-module -define-availability 'SwiftStdlib 5.1:macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0' | %FileCheck %s struct S {} diff --git a/test/decl/circularity.swift b/test/decl/circularity.swift index 65c683a966a..4cd53f05c7d 100644 --- a/test/decl/circularity.swift +++ b/test/decl/circularity.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift // N.B. Validating the pattern binding initializer for `pickMe` used to cause // recursive validation of the VarDecl. Check that we don't regress now that diff --git a/test/decl/class/circular_inheritance.swift b/test/decl/class/circular_inheritance.swift index 19281aa3863..8d361155808 100644 --- a/test/decl/class/circular_inheritance.swift +++ b/test/decl/class/circular_inheritance.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift class Left // expected-error {{'Left' inherits from itself}} expected-note {{through reference here}} : Right.Hand { // expected-note {{through reference here}} diff --git a/test/decl/ext/generic.swift b/test/decl/ext/generic.swift index 7952ed6d9d0..c411fb93344 100644 --- a/test/decl/ext/generic.swift +++ b/test/decl/ext/generic.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P1 { associatedtype AssocType } protocol P2 : P1 { } diff --git a/test/decl/ext/protocol.swift b/test/decl/ext/protocol.swift index f99b4ab95f6..612e236b046 100644 --- a/test/decl/ext/protocol.swift +++ b/test/decl/ext/protocol.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // ---------------------------------------------------------------------------- // Using protocol requirements from inside protocol extensions diff --git a/test/decl/protocol/conforms/circular_validation.swift b/test/decl/protocol/conforms/circular_validation.swift index 66153383041..f288f6d56d8 100644 --- a/test/decl/protocol/conforms/circular_validation.swift +++ b/test/decl/protocol/conforms/circular_validation.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift // With a bit of effort, we could make this work -- but for now, let's just // not crash. diff --git a/test/decl/protocol/existential_member_accesses_self_assoctype.swift b/test/decl/protocol/existential_member_accesses_self_assoctype.swift index 2268a9b3090..6fba7fe42f2 100644 --- a/test/decl/protocol/existential_member_accesses_self_assoctype.swift +++ b/test/decl/protocol/existential_member_accesses_self_assoctype.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -requirement-machine-abstract-signatures=on +// RUN: %target-typecheck-verify-swift -disable-availability-checking //===----------------------------------------------------------------------===// // Use of protocols with Self or associated type requirements diff --git a/test/decl/protocol/protocol_with_superclass.swift b/test/decl/protocol/protocol_with_superclass.swift index 06c7bb351b8..33324de7b82 100644 --- a/test/decl/protocol/protocol_with_superclass.swift +++ b/test/decl/protocol/protocol_with_superclass.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // Protocols with superclass-constrained Self. diff --git a/test/decl/protocol/protocol_with_superclass_where_clause.swift b/test/decl/protocol/protocol_with_superclass_where_clause.swift index 38959ef8fd4..715d802f81f 100644 --- a/test/decl/protocol/protocol_with_superclass_where_clause.swift +++ b/test/decl/protocol/protocol_with_superclass_where_clause.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // Protocols with superclass-constrained Self. diff --git a/test/decl/protocol/protocols.swift b/test/decl/protocol/protocols.swift index e48ae3b5fe5..202f5c7c540 100644 --- a/test/decl/protocol/protocols.swift +++ b/test/decl/protocol/protocols.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-objc-interop -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -enable-objc-interop protocol EmptyProtocol { } protocol DefinitionsInProtocols { diff --git a/test/decl/protocol/recursive_requirement.swift b/test/decl/protocol/recursive_requirement.swift index 7c82a6d8d91..c8a841d7bc4 100644 --- a/test/decl/protocol/recursive_requirement.swift +++ b/test/decl/protocol/recursive_requirement.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements // ----- diff --git a/test/decl/protocol/recursive_requirement_ok.swift b/test/decl/protocol/recursive_requirement_ok.swift index 74632ef7ac7..40ab6f5d792 100644 --- a/test/decl/protocol/recursive_requirement_ok.swift +++ b/test/decl/protocol/recursive_requirement_ok.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -debug-generic-signatures > %t.dump 2>&1 +// RUN: %target-typecheck-verify-swift +// RUN: %target-typecheck-verify-swift -debug-generic-signatures > %t.dump 2>&1 // RUN: %FileCheck %s < %t.dump protocol P { diff --git a/test/decl/protocol/req/associated_type_ambiguity.swift b/test/decl/protocol/req/associated_type_ambiguity.swift index 83086c73109..3dbbe40f5b3 100644 --- a/test/decl/protocol/req/associated_type_ambiguity.swift +++ b/test/decl/protocol/req/associated_type_ambiguity.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -requirement-machine-protocol-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=on -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s protocol P1 { typealias T = Int diff --git a/test/decl/protocol/req/associated_type_inference.swift b/test/decl/protocol/req/associated_type_inference.swift index b42f43cf1cf..8aece441335 100644 --- a/test/decl/protocol/req/associated_type_inference.swift +++ b/test/decl/protocol/req/associated_type_inference.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol P0 { associatedtype Assoc1 : PSimple // expected-note{{ambiguous inference of associated type 'Assoc1': 'Double' vs. 'Int'}} diff --git a/test/decl/protocol/req/associated_type_inference_fixed_type.swift b/test/decl/protocol/req/associated_type_inference_fixed_type.swift index 3df19d724a9..3c2bde37abc 100644 --- a/test/decl/protocol/req/associated_type_inference_fixed_type.swift +++ b/test/decl/protocol/req/associated_type_inference_fixed_type.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol P1 where A == Never { associatedtype A diff --git a/test/decl/protocol/req/associated_type_inference_fixed_type_experimental_inference.swift b/test/decl/protocol/req/associated_type_inference_fixed_type_experimental_inference.swift index f31c376895b..454aafff137 100644 --- a/test/decl/protocol/req/associated_type_inference_fixed_type_experimental_inference.swift +++ b/test/decl/protocol/req/associated_type_inference_fixed_type_experimental_inference.swift @@ -1,5 +1,5 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-associated-type-inference -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -// RUN: not %target-swift-frontend -typecheck -enable-experimental-associated-type-inference -dump-type-witness-systems -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on %s 2>&1 | %FileCheck %s +// RUN: %target-typecheck-verify-swift -enable-experimental-associated-type-inference +// RUN: not %target-swift-frontend -typecheck -enable-experimental-associated-type-inference -dump-type-witness-systems %s 2>&1 | %FileCheck %s protocol P1 where A == Never { associatedtype A diff --git a/test/decl/protocol/req/class.swift b/test/decl/protocol/req/class.swift index 3ce012aaa92..30a74c4f43f 100644 --- a/test/decl/protocol/req/class.swift +++ b/test/decl/protocol/req/class.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P1 : class { } diff --git a/test/decl/protocol/req/recursion.swift b/test/decl/protocol/req/recursion.swift index 3a4a4b42dbe..e97ed1a715b 100644 --- a/test/decl/protocol/req/recursion.swift +++ b/test/decl/protocol/req/recursion.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol SomeProtocol { associatedtype T diff --git a/test/decl/protocol/special/JSExport.swift b/test/decl/protocol/special/JSExport.swift index e5e82a876a2..23294e96841 100644 --- a/test/decl/protocol/special/JSExport.swift +++ b/test/decl/protocol/special/JSExport.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on | %FileCheck %s +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir | %FileCheck %s // REQUIRES: objc_interop import Foundation diff --git a/test/multifile/protocol-conformance-rdar39805133.swift b/test/multifile/protocol-conformance-rdar39805133.swift index 85764d54481..24fc37114a4 100644 --- a/test/multifile/protocol-conformance-rdar39805133.swift +++ b/test/multifile/protocol-conformance-rdar39805133.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-ir -o - -primary-file %s %S/Inputs/protocol-conformance-rdar39805133-other.swift -module-name foo -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -// RUN: %target-swift-frontend -emit-ir -o - %s -primary-file %S/Inputs/protocol-conformance-rdar39805133-other.swift -module-name foo -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-swift-frontend -emit-ir -o - -primary-file %s %S/Inputs/protocol-conformance-rdar39805133-other.swift -module-name foo +// RUN: %target-swift-frontend -emit-ir -o - %s -primary-file %S/Inputs/protocol-conformance-rdar39805133-other.swift -module-name foo protocol _Int : DefaultInit { associatedtype Minus1 : _Int diff --git a/test/type/opaque_parameters.swift b/test/type/opaque_parameters.swift index 661822a58c6..74cd976f639 100644 --- a/test/type/opaque_parameters.swift +++ b/test/type/opaque_parameters.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -disable-availability-checking -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -disable-availability-checking -warn-redundant-requirements protocol P { } diff --git a/test/type/opaque_return_named.swift b/test/type/opaque_return_named.swift index 1e2e5c50860..bc3553f0880 100644 --- a/test/type/opaque_return_named.swift +++ b/test/type/opaque_return_named.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -enable-experimental-named-opaque-types -disable-availability-checking -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -enable-experimental-named-opaque-types -disable-availability-checking // Tests for experimental extensions to opaque return type support. diff --git a/test/type/parameterized_existential.swift b/test/type/parameterized_existential.swift index 26b42bc6098..345774b31f5 100644 --- a/test/type/parameterized_existential.swift +++ b/test/type/parameterized_existential.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -disable-availability-checking -enable-parameterized-existential-types +// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-parameterized-existential-types protocol Sequence { associatedtype Element diff --git a/test/type/parameterized_protocol.swift b/test/type/parameterized_protocol.swift index 3a6aedf77c1..24e39ce8398 100644 --- a/test/type/parameterized_protocol.swift +++ b/test/type/parameterized_protocol.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -disable-availability-checking +// RUN: %target-typecheck-verify-swift -disable-availability-checking -// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -disable-availability-checking 2>&1 | %FileCheck %s +// RUN: not %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-availability-checking 2>&1 | %FileCheck %s /// Test some invalid syntax first diff --git a/test/type/protocol_composition.swift b/test/type/protocol_composition.swift index 28c880d548c..d2972e28c59 100644 --- a/test/type/protocol_composition.swift +++ b/test/type/protocol_composition.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -swift-version 4 func canonical_empty_protocol() -> Any { return 1 diff --git a/validation-test/compiler_crashers_2_fixed/0145-sr7097.swift b/validation-test/compiler_crashers_2_fixed/0145-sr7097.swift index 41f95125ccf..ed1713a4297 100644 --- a/validation-test/compiler_crashers_2_fixed/0145-sr7097.swift +++ b/validation-test/compiler_crashers_2_fixed/0145-sr7097.swift @@ -1,6 +1,6 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements -// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s -// RUN: %target-swift-frontend -primary-file %s -emit-ir -o - -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements +// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -primary-file %s -emit-ir -o - protocol P1 { } diff --git a/validation-test/compiler_crashers_2_fixed/0159-rdar40009245.swift b/validation-test/compiler_crashers_2_fixed/0159-rdar40009245.swift index 1d0181ea0ae..9becb7b44a2 100644 --- a/validation-test/compiler_crashers_2_fixed/0159-rdar40009245.swift +++ b/validation-test/compiler_crashers_2_fixed/0159-rdar40009245.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol P { associatedtype A : P where A.X == Self diff --git a/validation-test/compiler_crashers_2_fixed/0161-sr6569.swift b/validation-test/compiler_crashers_2_fixed/0161-sr6569.swift index 9442bdd51ad..7d538766b15 100644 --- a/validation-test/compiler_crashers_2_fixed/0161-sr6569.swift +++ b/validation-test/compiler_crashers_2_fixed/0161-sr6569.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift protocol P { associatedtype A: P // expected-note {{protocol requires nested type 'A'; do you want to add it?}} diff --git a/validation-test/compiler_crashers_2_fixed/0162-sr8019.swift b/validation-test/compiler_crashers_2_fixed/0162-sr8019.swift index 870f01fcddc..f9a17470d1f 100644 --- a/validation-test/compiler_crashers_2_fixed/0162-sr8019.swift +++ b/validation-test/compiler_crashers_2_fixed/0162-sr8019.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P {} struct A {} diff --git a/validation-test/compiler_crashers_2_fixed/0164-sr7989.swift b/validation-test/compiler_crashers_2_fixed/0164-sr7989.swift index 7dcf5192308..24410aa44a3 100644 --- a/validation-test/compiler_crashers_2_fixed/0164-sr7989.swift +++ b/validation-test/compiler_crashers_2_fixed/0164-sr7989.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on -warn-redundant-requirements +// RUN: %target-typecheck-verify-swift -warn-redundant-requirements protocol P1 {} protocol P2 {} diff --git a/validation-test/compiler_crashers_2_fixed/0173-circular-generic-type-alias-deserialization.swift b/validation-test/compiler_crashers_2_fixed/0173-circular-generic-type-alias-deserialization.swift index e1bf3f6b35b..b0e56669fae 100644 --- a/validation-test/compiler_crashers_2_fixed/0173-circular-generic-type-alias-deserialization.swift +++ b/validation-test/compiler_crashers_2_fixed/0173-circular-generic-type-alias-deserialization.swift @@ -1,5 +1,5 @@ // RUN: %empty-directory(%t) -// RUN: %target-build-swift -emit-module-path %t/foo.swiftmodule -Xfrontend -debug-generic-signatures -Xfrontend -requirement-machine-protocol-signatures=on %s 2>&1 | %FileCheck %s +// RUN: %target-build-swift -emit-module-path %t/foo.swiftmodule -Xfrontend -debug-generic-signatures %s 2>&1 | %FileCheck %s public protocol P { } public struct X { diff --git a/validation-test/compiler_crashers_2_fixed/0182-rdar45680857.swift b/validation-test/compiler_crashers_2_fixed/0182-rdar45680857.swift index 643706a462c..d8cde512d63 100644 --- a/validation-test/compiler_crashers_2_fixed/0182-rdar45680857.swift +++ b/validation-test/compiler_crashers_2_fixed/0182-rdar45680857.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -requirement-machine-protocol-signatures=on +// RUN: %target-swift-frontend -emit-ir %s public protocol Graph: class, Collection { associatedtype V diff --git a/validation-test/compiler_crashers_2_fixed/0189-sr10033.swift b/validation-test/compiler_crashers_2_fixed/0189-sr10033.swift index 6c7ccbf5eb5..fbe8fae19ff 100644 --- a/validation-test/compiler_crashers_2_fixed/0189-sr10033.swift +++ b/validation-test/compiler_crashers_2_fixed/0189-sr10033.swift @@ -1,5 +1,5 @@ -// RUN: %target-swift-frontend -emit-ir -verify -requirement-machine-abstract-signatures=on %s -// RUN: %target-swift-frontend -emit-ir -verify -requirement-machine-abstract-signatures=on -disable-requirement-machine-concrete-contraction %s +// RUN: %target-swift-frontend -emit-ir -verify %s +// RUN: %target-swift-frontend -emit-ir -verify -disable-requirement-machine-concrete-contraction %s protocol P1 { associatedtype A2 : P2 where A2.A1 == Self diff --git a/validation-test/compiler_crashers_2_fixed/0192-rdar39826863.swift b/validation-test/compiler_crashers_2_fixed/0192-rdar39826863.swift index bcea233e5b3..4c0dd4fcee7 100644 --- a/validation-test/compiler_crashers_2_fixed/0192-rdar39826863.swift +++ b/validation-test/compiler_crashers_2_fixed/0192-rdar39826863.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -requirement-machine-protocol-signatures=on +// RUN: %target-swift-frontend -emit-ir %s protocol Tuple { associatedtype Head diff --git a/validation-test/compiler_crashers_2_fixed/rdar56398071.swift b/validation-test/compiler_crashers_2_fixed/rdar56398071.swift index f08d122ad19..bd504e1bfe6 100644 --- a/validation-test/compiler_crashers_2_fixed/rdar56398071.swift +++ b/validation-test/compiler_crashers_2_fixed/rdar56398071.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -primary-file %s -emit-ir -requirement-machine-protocol-signatures=on +// RUN: %target-swift-frontend -primary-file %s -emit-ir public protocol WrappedSignedInteger: SignedInteger where Stride == Int { typealias WrappedInteger = Int diff --git a/validation-test/compiler_crashers_2_fixed/rdar69073431.swift b/validation-test/compiler_crashers_2_fixed/rdar69073431.swift index 2433d6b3030..130da67ccfc 100644 --- a/validation-test/compiler_crashers_2_fixed/rdar69073431.swift +++ b/validation-test/compiler_crashers_2_fixed/rdar69073431.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir %s -debug-generic-signatures -requirement-machine-inferred-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir %s -debug-generic-signatures 2>&1 | %FileCheck %s // REQUIRES: OS=macosx import Combine diff --git a/validation-test/compiler_crashers_2_fixed/sr11639.swift b/validation-test/compiler_crashers_2_fixed/sr11639.swift index a24d2e053c2..934a907e734 100644 --- a/validation-test/compiler_crashers_2_fixed/sr11639.swift +++ b/validation-test/compiler_crashers_2_fixed/sr11639.swift @@ -1,4 +1,4 @@ -// RUN: %target-swift-frontend -emit-ir -primary-file %s -debug-generic-signatures -requirement-machine-protocol-signatures=on 2>&1 | %FileCheck %s +// RUN: %target-swift-frontend -emit-ir -primary-file %s -debug-generic-signatures 2>&1 | %FileCheck %s public protocol FooProtocol { associatedtype Bar diff --git a/validation-test/compiler_crashers_2_fixed/sr9584.swift b/validation-test/compiler_crashers_2_fixed/sr9584.swift index df602b73f50..04164eee629 100644 --- a/validation-test/compiler_crashers_2_fixed/sr9584.swift +++ b/validation-test/compiler_crashers_2_fixed/sr9584.swift @@ -1,4 +1,4 @@ -// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on +// RUN: %target-typecheck-verify-swift struct S {} diff --git a/validation-test/compiler_crashers_fixed/00228-swift-clangimporter-loadextensions.swift b/validation-test/compiler_crashers_fixed/00228-swift-clangimporter-loadextensions.swift index 7640644f4b1..80b7c390cef 100644 --- a/validation-test/compiler_crashers_fixed/00228-swift-clangimporter-loadextensions.swift +++ b/validation-test/compiler_crashers_fixed/00228-swift-clangimporter-loadextensions.swift @@ -5,7 +5,7 @@ // See https://swift.org/LICENSE.txt for license information // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -// RUN: not %target-swift-frontend %s -typecheck -requirement-machine-inferred-signatures=on +// RUN: not %target-swift-frontend %s -typecheck func s() -> o { r q { } diff --git a/validation-test/compiler_crashers_fixed/00237-swift-declrefexpr-setspecialized.swift b/validation-test/compiler_crashers_fixed/00237-swift-declrefexpr-setspecialized.swift index 2cf979e87b2..9d7ed5dae40 100644 --- a/validation-test/compiler_crashers_fixed/00237-swift-declrefexpr-setspecialized.swift +++ b/validation-test/compiler_crashers_fixed/00237-swift-declrefexpr-setspecialized.swift @@ -5,7 +5,7 @@ // See https://swift.org/LICENSE.txt for license information // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -// RUN: not %target-swift-frontend %s -typecheck -requirement-machine-inferred-signatures=on +// RUN: not %target-swift-frontend %s -typecheck func b(c) -> (() -> d) { } struct d { diff --git a/validation-test/compiler_crashers_fixed/00365-getselftypeforcontainer.swift b/validation-test/compiler_crashers_fixed/00365-getselftypeforcontainer.swift index 36295df56b5..81415830c3d 100644 --- a/validation-test/compiler_crashers_fixed/00365-getselftypeforcontainer.swift +++ b/validation-test/compiler_crashers_fixed/00365-getselftypeforcontainer.swift @@ -5,7 +5,7 @@ // See https://swift.org/LICENSE.txt for license information // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -// RUN: not %target-swift-frontend %s -typecheck -requirement-machine-inferred-signatures=on +// RUN: not %target-swift-frontend %s -typecheck class d : e { } class d { diff --git a/validation-test/compiler_crashers_fixed/01107-std-function-func-swift-type-subst.swift b/validation-test/compiler_crashers_fixed/01107-std-function-func-swift-type-subst.swift index 6becbc00f59..413d0a8e433 100644 --- a/validation-test/compiler_crashers_fixed/01107-std-function-func-swift-type-subst.swift +++ b/validation-test/compiler_crashers_fixed/01107-std-function-func-swift-type-subst.swift @@ -5,7 +5,7 @@ // See https://swift.org/LICENSE.txt for license information // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -// RUN: not %target-swift-frontend %s -typecheck -requirement-machine-inferred-signatures=on +// RUN: not %target-swift-frontend %s -typecheck func b : e { } diff --git a/validation-test/compiler_crashers_fixed/01177-std-function-func-swift-type-subst.swift b/validation-test/compiler_crashers_fixed/01177-std-function-func-swift-type-subst.swift index 5f6622f3c76..b9d554e3bb7 100644 --- a/validation-test/compiler_crashers_fixed/01177-std-function-func-swift-type-subst.swift +++ b/validation-test/compiler_crashers_fixed/01177-std-function-func-swift-type-subst.swift @@ -5,7 +5,7 @@ // See https://swift.org/LICENSE.txt for license information // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -// RUN: not %target-swift-frontend %s -typecheck -requirement-machine-inferred-signatures=on +// RUN: not %target-swift-frontend %s -typecheck class d : e { } class d { diff --git a/validation-test/compiler_crashers_fixed/28839-genericsig.swift b/validation-test/compiler_crashers_fixed/28839-genericsig.swift index c33ac235d9e..cd2fac70f06 100644 --- a/validation-test/compiler_crashers_fixed/28839-genericsig.swift +++ b/validation-test/compiler_crashers_fixed/28839-genericsig.swift @@ -6,7 +6,7 @@ // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -// RUN: not %target-swift-frontend %s -emit-ir -requirement-machine-protocol-signatures=on +// RUN: not %target-swift-frontend %s -emit-ir class a{ class a