Skip to content

Commit 50159d1

Browse files
committed
[Gardening] Use Vendor=apple Where Possible
This simplifies the usual bundle of OS checks OS=macosx || OS=ios || OS=tvos || OS=watchos into VENDOR=apple which was added in swiftlang#27307
1 parent cddf73e commit 50159d1

File tree

107 files changed

+107
-107
lines changed

Some content is hidden

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

107 files changed

+107
-107
lines changed

test/Driver/opt-record-bitstream.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: llvm-bcanalyzer -dump %t/optrecordmod.opt.bitstream | %FileCheck -check-prefix=BITSTREAM %s
44
// RUN: otool -l %t/opt-record.o | %FileCheck -check-prefix=OBJ %s
55

6-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos
6+
// REQUIRES: VENDOR=apple
77

88
// Ensure we emitted the appropriate section
99

test/IRGen/conditional_conformances_future.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
// Too many pointer-sized integers in the IR
77
// REQUIRES: PTRSIZE=64
8-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
8+
// REQUIRES: VENDOR=apple || OS=linux-gnu
99

test/IRGen/dynamic_self_metadata_future.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -prespecialize-generic-metadata %s -target %module-target-future -emit-ir -parse-as-library | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
22

33

4-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
4+
// REQUIRES: VENDOR=apple || OS=linux-gnu
55
// REQUIRES: CPU=x86_64
66

77
// FIXME: Not a SIL test because we can't parse dynamic Self in SIL.

test/IRGen/enum_future.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %target-swift-frontend -disable-type-layout -prespecialize-generic-metadata %s -target %module-target-future -gnone -emit-ir -disable-diagnostic-passes -disable-objc-interop | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-native --check-prefix=CHECK-native-%target-ptrsize -DWORD=i%target-ptrsize
55

66
// REQUIRES: CPU=i386 || CPU=x86_64
7-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
7+
// REQUIRES: VENDOR=apple || OS=linux-gnu
88
// UNSUPPORTED: CPU=i386 && OS=ios
99
// UNSUPPORTED: CPU=armv7 && OS=ios
1010
// UNSUPPORTED: CPU=armv7s && OS=ios

test/IRGen/enum_value_semantics_future.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %target-swift-frontend -disable-type-layout -prespecialize-generic-metadata %s -target %module-target-future -gnone -emit-ir -disable-objc-interop | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-native --check-prefix=CHECK-native-%target-ptrsize --check-prefix=CHECK-%target-os --check-prefix=CHECK-native-%target-os
33

44
// REQUIRES: CPU=x86_64
5-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
5+
// REQUIRES: VENDOR=apple || OS=linux-gnu
66
// UNSUPPORTED: CPU=i386 && OS=ios
77
// UNSUPPORTED: CPU=armv7 && OS=ios
88
// UNSUPPORTED: CPU=armv7s && OS=ios

test/IRGen/foreign_types_future.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -I %S/Inputs/abi %s -emit-ir | %FileCheck %s -DINT=i%target-ptrsize
22

3-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
3+
// REQUIRES: VENDOR=apple || OS=linux-gnu
44
// UNSUPPORTED: CPU=i386 && OS=ios
55
// UNSUPPORTED: CPU=armv7 && OS=ios
66
// UNSUPPORTED: CPU=armv7s && OS=ios

test/IRGen/generic_metatypes_future.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// RUN: %swift -prespecialize-generic-metadata -module-name generic_metatypes -target armv7k-apple-watchos9.99 -emit-ir -disable-legacy-type-info -parse-stdlib -primary-file %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-32 -DINT=i32 %s
1111

1212

13-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
13+
// REQUIRES: VENDOR=apple || OS=linux-gnu
1414
// REQUIRES: CODEGENERATOR=X86
1515
// REQUIRES: CODEGENERATOR=ARM
1616

test/IRGen/generic_structs_future.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %{python} %utils/chex.py < %s > %t/generic_structs_future.sil
33
// RUN: %target-swift-frontend -disable-type-layout -prespecialize-generic-metadata -target %module-target-future %t/generic_structs_future.sil -emit-ir | %FileCheck %t/generic_structs_future.sil
44

5-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
5+
// REQUIRES: VENDOR=apple || OS=linux-gnu
66
// REQUIRES: CPU=x86_64
77

88
import Builtin

test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_distinct_generic_class.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
22

3-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
3+
// REQUIRES: VENDOR=apple || OS=linux-gnu
44
// UNSUPPORTED: CPU=i386 && OS=ios
55
// UNSUPPORTED: CPU=armv7 && OS=ios
66
// UNSUPPORTED: CPU=armv7s && OS=ios

test/IRGen/prespecialized-metadata/class-fileprivate-2argument-1_distinct_use-1st_argument_generic_class-2nd_argument_same_generic_class_different_value.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %swift -prespecialize-generic-metadata -target %module-target-future -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment --check-prefix=CHECK --check-prefix=CHECK-%target-vendor
22

3-
// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchos || OS=linux-gnu
3+
// REQUIRES: VENDOR=apple || OS=linux-gnu
44
// UNSUPPORTED: CPU=i386 && OS=ios
55
// UNSUPPORTED: CPU=armv7 && OS=ios
66
// UNSUPPORTED: CPU=armv7s && OS=ios

0 commit comments

Comments
 (0)