Skip to content

Commit 3280bf8

Browse files
compnerdcompnerd
authored
Merge pull request #31843 from apple/revert-31839-pr31839
Revert "[IRGen testing] Fix bogus FileCheck check-prefix "-SAME" usage"
2 parents f30e183 + 6a1c4f0 commit 3280bf8

File tree

2 files changed

+40
-41
lines changed

2 files changed

+40
-41
lines changed

‎test/IRGen/class_resilience.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
// CHECK: @"$s16class_resilience27ClassWithResilientThenEmptyC9resilient0H7_struct0E3IntVvpWvd" = hidden global [[INT]] 0,
2121

2222
// CHECK: @"$s16class_resilience26ClassWithResilientPropertyCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
23-
// CHECK-32-SAME: { [[INT]] 52, i32 2, i32 13 }
24-
// CHECK-64-SAME: { [[INT]] 80, i32 2, i32 14 }
23+
// CHECK-SAME-32: { [[INT]] 52, i32 2, i32 13 }
24+
// CHECK-SAME-64: { [[INT]] 80, i32 2, i32 10 }
2525

2626
// CHECK: @"$s16class_resilience28ClassWithMyResilientPropertyC1rAA0eF6StructVvpWvd" = hidden constant [[INT]] {{8|16}}
2727
// CHECK: @"$s16class_resilience28ClassWithMyResilientPropertyC5colors5Int32VvpWvd" = hidden constant [[INT]] {{12|20}}
@@ -101,20 +101,20 @@
101101
// CHECK-native-SAME: i32 0
102102

103103
// CHECK: @"$s16class_resilience17MyResilientParentCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
104-
// CHECK-32-SAME: { [[INT]] 52, i32 2, i32 13 }
105-
// CHECK-64-SAME: { [[INT]] 80, i32 2, i32 12 }
104+
// CHECK-SAME-32: { [[INT]] 52, i32 2, i32 13 }
105+
// CHECK-SAME-64: { [[INT]] 80, i32 2, i32 10 }
106106

107107
// CHECK: @"$s16class_resilience16MyResilientChildCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
108-
// CHECK-32-SAME: { [[INT]] 60, i32 2, i32 15 }
109-
// CHECK-64-SAME: { [[INT]] 96, i32 2, i32 13 }
108+
// CHECK-SAME-32: { [[INT]] 60, i32 2, i32 15 }
109+
// CHECK-SAME-64: { [[INT]] 96, i32 2, i32 12 }
110110

111111
// CHECK: @"$s16class_resilience24MyResilientGenericParentCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
112-
// CHECK-32-SAME: { [[INT]] 52, i32 2, i32 13 }
113-
// CHECK-64-SAME: { [[INT]] 80, i32 2, i32 13 }
112+
// CHECK-SAME-32: { [[INT]] 52, i32 2, i32 13 }
113+
// CHECK-SAME-64: { [[INT]] 80, i32 2, i32 10 }
114114

115115
// CHECK: @"$s16class_resilience24MyResilientConcreteChildCMo" = {{(protected )?}}{{(dllexport )?}}constant [[BOUNDS]]
116-
// CHECK-32-SAME: { [[INT]] 64, i32 2, i32 16 }
117-
// CHECK-64-SAME: { [[INT]] 104, i32 2, i32 15 }
116+
// CHECK-SAME-32: { [[INT]] 64, i32 2, i32 16 }
117+
// CHECK-SAME-64: { [[INT]] 104, i32 2, i32 13 }
118118

119119
// CHECK: @"$s16class_resilience27ClassWithEmptyThenResilientC5emptyAA0E0VvpWvd" = hidden constant [[INT]] 0,
120120
// CHECK: @"$s16class_resilience27ClassWithResilientThenEmptyC5emptyAA0G0VvpWvd" = hidden constant [[INT]] 0,

‎test/IRGen/generic_classes.sil‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %{python} %utils/chex.py < %s > %t/generic_classes.sil
3-
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir -enable-objc-interop | %FileCheck %t/generic_classes.sil --check-prefixes=CHECK,CHECK-objc,CHECK-%target-import-type
4-
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir -disable-objc-interop | %FileCheck %t/generic_classes.sil --check-prefixes=CHECK,CHECK-native,CHECK-%target-import-type
3+
// RUN: %target-swift-frontend %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=CHECK --check-prefix=CHECK-%target-runtime -check-prefix CHECK-%target-import-type
54
// RUN: %target-swift-frontend -Osize %t/generic_classes.sil -emit-ir | %FileCheck %t/generic_classes.sil --check-prefix=OSIZE
65

76
// REQUIRES: CPU=x86_64
@@ -53,20 +52,21 @@ import Swift
5352
// -- flags
5453
// CHECK_SAME: i32 3,
5554
// -- immediate pattern size
56-
// CHECK-native-SAME: i16 0,
57-
// CHECK-objc-SAME: i16 5,
55+
// CHECK-SAME: i16 0,
5856
// -- immediate pattern target offset
59-
// CHECK-SAME: i16 0,
57+
// CHECK-SAME: i16 0,
6058
// -- extra data size
61-
// CHECK-native-SAME: i16 0,
62-
// CHECK-objc-SAME: i16 14,
59+
// CHECK-SAME-native: i16 0,
60+
// CHECK-SAME-objc: i16 23,
6361
// -- class ro-data offset
64-
// CHECK-native-SAME: i16 0
65-
// CHECK-objc-SAME: i16 0,
62+
// CHECK-SAME-native: i16 0,
63+
// CHECK-SAME-objc: i16 5,
6664
// -- metaclass object offset
67-
// CHECK-objc-SAME: i16 0,
65+
// CHECK-SAME-native: i16 0,
66+
// CHECK-SAME-objc: i16 0,
6867
// -- class ro-data offset
69-
// CHECK-objc-SAME: i16 23
68+
// CHECK-SAME-native: i16 0
69+
// CHECK-SAME-objc: i16 14,
7070
// CHECK-SAME: }>
7171

7272
// -- Check that offset vars are emitted for fixed-layout generics
@@ -94,15 +94,15 @@ import Swift
9494
// CHECK-SAME: void (%T15generic_classes14RootNonGenericC*)* @"$s15generic_classes14RootNonGenericCfD",
9595
// CHECK-DIRECT-SAME: i8** @"$sBoWV",
9696
// CHECK-INDIRECT-SAME: i8** null,
97-
// CHECK-native-SAME: i64 0,
98-
// CHECK-native-SAME: %swift.type* null,
99-
// CHECK-native-SAME: %swift.opaque* null,
100-
// CHECK-objc-SAME: i64 ptrtoint (%objc_class* @"$s15generic_classes14RootNonGenericCMm" to i64),
101-
// CHECK-objc-SAME: %objc_class* @"OBJC_CLASS_$_{{(_TtCs12_)?}}SwiftObject",
102-
// CHECK-objc-SAME: %swift.opaque* @_objc_empty_cache,
97+
// CHECK-SAME-native: i64 0,
98+
// CHECK-SAME-native: %swift.type* null,
99+
// CHECK-SAME-native: %swift.opaque* null,
100+
// CHECK-SAME-objc: i64 ptrtoint (%objc_class* @"$s15generic_classes14RootNonGenericCMm" to i64),
101+
// CHECK-SAME-objc: %objc_class* @"OBJC_CLASS_$_{{(_TtCs12_)?}}SwiftObject",
102+
// CHECK-SAME-objc: %swift.opaque* @_objc_empty_cache,
103103
// CHECK-SAME: %swift.opaque* null,
104-
// CHECK-native-SAME: i64 1,
105-
// CHECK-objc-SAME: @_DATA__TtC15generic_classes14RootNonGeneric
104+
// CHECK-SAME-native: i64 1,
105+
// CHECK-SAME-objc: @_DATA__TtC15generic_classes14RootNonGeneric
106106
// CHECK-SAME: i32 33,
107107
// CHECK-SAME: i16 7,
108108
// CHECK-SAME: i16 0,
@@ -117,30 +117,29 @@ import Swift
117117
// -- template instantiation function
118118
// CHECK-SAME: %swift.type* (%swift.type_descriptor*, i8**, i8*)* @"$s15generic_classes015GenericInheritsC0CMi"
119119
// -- pattern flags (1 == has extra data pattern)
120-
// CHECK-native-SAME: i32 0,
121-
// CHECK-objc-SAME: i32 1,
120+
// CHECK-SAME-native: i32 0,
121+
// CHECK-SAME-objc: i32 1,
122122
// -- heap destructor
123123
// CHECK-SAME: @"$s15generic_classes015GenericInheritsC0CfD"
124124
// -- ivar destroyer
125125
// CHECK-SAME: i32 0,
126126
// -- class flags
127127
// CHECK_SAME: i32 3,
128128
// -- extra data pattern offset
129-
// CHECK-objc-SAME: i16 5,
129+
// CHECK-SAME-objc: i16 0,
130130
// -- extra data pattern size
131-
// CHECK-objc-SAME: i16 0,
131+
// CHECK-SAME-objc: i16 23,
132132
// -- class ro-data offset
133-
// CHECK-native-SAME: i16 0,
134-
// CHECK-objc-SAME: i16 14,
133+
// CHECK-SAME-native: i16 0,
134+
// CHECK-SAME-objc: i16 5,
135135
// -- metaclass object offset
136-
// CHECK-native-SAME: i16 0,
137-
// CHECK-objc-SAME: i16 0,
136+
// CHECK-SAME-native: i16 0,
137+
// CHECK-SAME-objc: i16 0,
138138
// -- class ro-data offset
139-
// CHECK-native-SAME: i16 0,
140-
// CHECK-objc-SAME: i16 0,
139+
// CHECK-SAME-native: i16 0,
140+
// CHECK-SAME-objc: i16 14,
141141
// -- reserved
142-
// CHECK-native-SAME: i16 0
143-
// CHECK-objc-SAME: i16 23
142+
// CHECK-SAME: i16 0
144143
// CHECK-SAME: }
145144

146145
// CHECK: @"$s15generic_classes018GenericInheritsNonC0CMP"

0 commit comments

Comments
 (0)