Skip to content

Commit 819809b

Browse files
eecksteineeckstein
authored
Merge pull request #61978 from eeckstein/test-fixes
tests: fix misspelled check prefixes
2 parents 6df38a6 + 624f946 commit 819809b

32 files changed

+90
-93
lines changed

‎test/AutoDiff/SILOptimizer/activity_analysis.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-sil -verify -Xllvm -debug-only=differentiation 2>&1 %s | %FileCheck %s
1+
// RUN: %target-swift-emit-sil -verify -Xllvm -debug-only=differentiation %s 2>&1 | %FileCheck %s
22
// REQUIRES: asserts
33

44
import _Differentiation
@@ -456,7 +456,7 @@ func activeInoutArgMutatingMethodVar(_ nonactive: inout Mut, _ x: Mut) {
456456
nonactive = result
457457
}
458458

459-
// CHECK_LABEL: [AD] Activity info for ${{.*}}31activeInoutArgMutatingMethodVaryyAA3MutVz_ADtF at (parameters=(1) results=(0))
459+
// CHECK-LABEL: [AD] Activity info for ${{.*}}31activeInoutArgMutatingMethodVaryyAA3MutVz_ADtF at parameter indices (1) and result indices (0)
460460
// CHECK: [ACTIVE] %0 = argument of bb0 : $*Mut
461461
// CHECK: [ACTIVE] %1 = argument of bb0 : $Mut
462462
// CHECK: [ACTIVE] %4 = alloc_stack $Mut, var, name "result"

‎test/Concurrency/Runtime/exclusivity.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ struct Runner {
479479
// CHECK-NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): (0x0, 0x0)
480480
// CHECK-NEXT: Access. Pointer: [[ACCESS]]. PC:
481481
// CHECK: Exiting Thread Local Context. After Swizzle. Task: [[TASK]]
482-
// CHECK_NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): ([[LLNODE]], [[LLNODE]])
483-
// CHECK_NEXT: No Accesses.
482+
// CHECK-NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): ([[LLNODE]], [[LLNODE]])
483+
// CHECK-NEXT: No Accesses.
484484
//
485485
// CHECK-NOT: Removing access:
486486
// CHECK: ==> End Inner Task Handle

‎test/Concurrency/async_main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func asyncFunc() async {
4040

4141

4242
// async_Main
43-
// CHECK-SIL_LABEL: sil hidden @async_Main : $@convention(thin) @async () -> () {
43+
// CHECK-SIL-LABEL: sil hidden @async_Main : $@convention(thin) @async () -> () {
4444
// call main
4545
// CHECK-SIL: %0 = metatype $@thin MyProgram.Type // user: %2
4646
// CHECK-SIL-NEXT: // function_ref static MyProgram.$main()

‎test/DebugInfo/fnptr.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func main() -> Int64 {
3636
baz_fnptr(2.89)
3737

3838
// CHECK-DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZPT:[0-9]+]]
39-
// AST_DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZ_T:[0-9]+]]
39+
// AST-DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZ_T:[0-9]+]]
4040
// AST-DAG: ![[BARZ_T:[0-9]+]] = !DICompositeType({{.*}}, identifier: "$sS2fs5Int64VIegyyd_D")
4141
// CHECK-DAG: ![[BARZPT]] = !DICompositeType(tag: DW_TAG_structure_type,{{.*}} elements: ![[BARZMEMBERS:[0-9]+]]
4242
// CHECK-DAG: ![[BARZMEMBERS]] = !{![[BARZMEMBER:.*]], {{.*}}}

‎test/IDE/complete_func_reference.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ do {
121121
}
122122

123123
// ANY_INT: Begin completions
124-
// ANY_INT_DAG: Decl{{.*}}/TypeRelation[Convertible]: anyToInt(a:); name=anyToInt(a:)
124+
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Convertible]: anyToInt(a:)[#(Any) -> Int#]; name=anyToInt(a:)
125125
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: intToVoid({#a: Int#})[#Void#];
126126
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: anyToVoid({#a: Any#})[#Void#];
127127
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: voidToVoid()[#Void#];

‎test/IDE/complete_keywords.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// KW_DECL-DAG: Keyword/None: override{{; name=.+$}}
3131
// KW_DECL-DAG: Keyword/None: postfix{{; name=.+$}}
3232
// KW_DECL-DAG: Keyword/None: prefix{{; name=.+$}}
33-
// KW_DECL_DAG: Keyword[precedencegroup]: precedencegroup{{; name=.+$}}
33+
// KW_DECL-DAG: Keyword[precedencegroup]: precedencegroup{{; name=.+$}}
3434
// KW_DECL-DAG: Keyword[private]/None: private{{; name=.+$}}
3535
// KW_DECL-DAG: Keyword[protocol]/None: protocol{{; name=.+$}}
3636
// KW_DECL-DAG: Keyword[public]/None: public{{; name=.+$}}

‎test/IDE/complete_property_delegate_attribute.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ struct TestStruct {
4747
// FIXME: No call patterns are suggested if we are completing in variable with multiple property wrappers (rdar://91480982)
4848
func sync1() {}
4949

50-
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG_LABEL^#) var test4
51-
// SECOND_ARG_LABEL: Begin completions, 1 items
52-
// SECOND_ARG_LABEL-DAG: Pattern/Local/Flair[ArgLabels]: {#arg2: Int#}[#Int#];
53-
// SECOND_ARG_LABEL: End completions
50+
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG1^#) var test4
51+
// SECOND_ARG1: Begin completions, 1 items
52+
// SECOND_ARG1-DAG: Pattern/Local/Flair[ArgLabels]: {#arg2: Int#}[#Int#];
53+
// SECOND_ARG1: End completions
5454

55-
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG_LABEL_NO_VAR?check=SECOND_ARG_LABEL^#)
55+
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG1_LABEL_NO_VAR?check=SECOND_ARG1^#)
5656

5757
// FIXME: No call patterns are suggested if we are completing in variable with multiple property wrappers (rdar://91480982)
5858
func sync2() {}

‎test/IDE/conforming-methods-basic.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ func testing(obj: C) {
4040
}
4141

4242
// CHECK_1: -----BEGIN CONFORMING METHOD LIST-----
43-
// CHECK_1_NEXT: - TypeName: C
44-
// CHECK_1_NEXT: - Members:
45-
// CHECK_1_NEXT: - Name: returnsConcreteTarget1()
46-
// CHECK_1_NEXT: TypeName: ConcreteTarget1
47-
// CHECK_1_NEXT: - Name: returnsConcreteTarget1()
48-
// CHECK_1_NEXT: TypeName: ConcreteTarget1
49-
// CHECK_1_NEXT: -----END CONFORMING METHOD LIST-----
43+
// CHECK_1-NEXT: - TypeName: C
44+
// CHECK_1-NEXT: - Members:
45+
// CHECK_1-NEXT: - Name: returnsConcreteTarget1()
46+
// CHECK_1-NEXT: TypeName: ConcreteTarget1
47+
// CHECK_1-NEXT: - Name: returnsConcreteTarget2()
48+
// CHECK_1-NEXT: TypeName: ConcreteTarget2
49+
// CHECK_1-NEXT: -----END CONFORMING METHOD LIST-----

‎test/IRGen/closure.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func no_capture_descriptor(_ c: C, _ d: C, _ e: C, _ f: C, _ g: C) {
6969
// CHECK-LABEL: define hidden swiftcc { i8*, %swift.refcounted* } @"$s7closure9letEscape1fyycyyXE_tF"(i8* %0, %swift.opaque* %1)
7070
// CHECK: call zeroext i1 @swift_isEscapingClosureAtFileLocation(%swift.refcounted* {{.*}}, i8* getelementptr inbounds ({{.*}} [[FILENAME]]
7171
// OPT-LABEL: define hidden swiftcc { i8*, %swift.refcounted* } @"$s7closure9letEscape1fyycyyXE_tF"(i8* %0, %swift.opaque* %1)
72-
// OPT: call zeroext i1 @swift_isEscapingClosureAtFileLocation(%swift.refcounted* {{.*}}, i8* getelementptr inbounds ({{.*}} [[FILENAME]]
72+
// OPT: call zeroext i1 @swift_isEscapingClosureAtFileLocation(%swift.refcounted* {{.*}}, i8* {{(nonnull )?}}getelementptr inbounds ({{.*}} [[FILENAME]]
7373
func letEscape(f: () -> ()) -> () -> () {
7474
return withoutActuallyEscaping(f) { return $0 }
7575
}

‎test/IRGen/dllexport.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ open class d {
3636
// CHECK-DAG: define dllexport swiftcc %swift.refcounted* @"$s9dllexport1cCfd"(%T9dllexport1cC*{{.*}})
3737
// CHECK-DAG-NO-OPT: define dllexport swiftcc %T9dllexport1cC* @"$s9dllexport1cCACycfc"(%T9dllexport1cC* %0)
3838
// CHECK-DAG-NO-OPT: define dllexport swiftcc %T9dllexport1cC* @"$s9dllexport1cCACycfC"(%swift.type* %0)
39-
// CHECK-DAG: define dllexport swiftcc i8* @"$s9dllexport2ciAA1cCvau"()
39+
// CHECK-DAG: define dllexport swiftcc {{(nonnull )?}}i8* @"$s9dllexport2ciAA1cCvau"()
4040
// CHECK-DAG-NO-OPT: define dllexport swiftcc void @"$s9dllexport1dC1m33_C57BA610BA35E21738CC992438E660E9LLyyF"(%T9dllexport1dC* %0)
4141
// CHECK-DAG-NO-OPT: define dllexport swiftcc void @"$s9dllexport1dCfD"(%T9dllexport1dC* %0)
4242
// CHECK-DAG: define dllexport swiftcc %swift.refcounted* @"$s9dllexport1dCfd"(%T9dllexport1dC*{{.*}})

‎test/IRGen/reflection_metadata.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
// RUN: %target-swift-frontend -disable-reflection-names -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
33
// RUN: %target-swift-frontend -disable-reflection-metadata -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA
44

5-
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_reflect|.sw5rfst\$B}}
6-
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_fieldmd|.sw5flmd\$B}}
7-
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_assocty|.sw5asty\$B}}
5+
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_assocty|.sw5asty\$B}}
86
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_capture|.sw5cptr\$B}}
97
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_typeref|.sw5tyrf\$B}}
108
// STRIP_REFLECTION_NAMES-DAG: private constant [6 x i8] c"Inner\00", section "{{[^"]*swift5_reflstr|.sw5rfst\$B}}

‎test/Interop/SwiftToC/structs/large-structs-pass-return-indirect-in-c.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public struct StructSeveralI64 {
1111
// CHECK-NEXT: _Alignas(8) char _storage[40];
1212
// CHECK-NEXT: };
1313

14-
// CHECK_NOT: swift_interop
14+
// CHECK-NOT: swift_interop
1515

1616
public func returnNewStructSeveralI64(i: Int64) -> StructSeveralI64 {
1717
return StructSeveralI64(x1: i, x2: 0, x3: -17, x4: 12345612, x5: -0xFFFF)

‎test/Interop/SwiftToC/structs/small-structs-64-bit-pass-return-direct-in-c.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ public struct StructI8AndU32AndI16 {
2222
}
2323

2424
// CHECK: struct Structs_StructI8AndU32AndI16 {
25-
// CHECK_NEXT: _Alignas(4) char _storage[10];
26-
// CHECK_NEXT: };
25+
// CHECK-NEXT: _Alignas(4) char _storage[10];
26+
// CHECK-NEXT: };
2727

2828
// CHECK: struct Structs_StructOneI16AndOneStruct {
29-
// CHECK_NEXT: _Alignas(4) char _storage[12];
30-
// CHECK_NEXT: };
29+
// CHECK-NEXT: _Alignas(4) char _storage[12];
30+
// CHECK-NEXT: };
3131

3232
// CHECK: struct Structs_StructTwoI32 {
33-
// CHECK_NEXT: _Alignas(4) char _storage[8];
34-
// CHECK_NEXT: };
33+
// CHECK-NEXT: _Alignas(4) char _storage[8];
34+
// CHECK-NEXT: };
3535

3636
public func returnNewStructTwoI32(_ x: Int32) -> StructTwoI32 { return StructTwoI32(x: x, y: x * 2) }
3737

‎test/Interop/SwiftToC/structs/small-structs-pass-return-direct-in-c.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ public struct StructDoubleAndFloat {
1919
}
2020

2121
// CHECK: struct Structs_StructDoubleAndFloat {
22-
// CHECK_NEXT: _Alignas(8) char _storage[12];
23-
// CHECK_NEXT: };
22+
// CHECK-NEXT: _Alignas(8) char _storage[12];
23+
// CHECK-NEXT: };
2424

2525
// CHECK: struct Structs_StructOneI64 {
26-
// CHECK_NEXT: _Alignas(8) char _storage[8];
27-
// CHECK_NEXT: };
26+
// CHECK-NEXT: _Alignas(8) char _storage[8];
27+
// CHECK-NEXT: };
2828

2929
// CHECK: struct Structs_StructU16AndPointer {
30-
// CHECK_NEXT: _Alignas(8) char _storage[16];
31-
// CHECK_NEXT: };
30+
// CHECK-NEXT: _Alignas(8) char _storage[16];
31+
// CHECK-NEXT: };
3232

3333
public func returnNewStructOneI64() -> StructOneI64 { return StructOneI64(x: 42 ) }
3434

‎test/SIL/Parser/stored_property.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Rect {
88
init(orgx: Double)
99
}
1010

11-
// CHECK_LABEL: sil @_TFC4rect4Rectg4orgxSd
11+
// CHECK-LABEL: sil @_TFC4rect4Rectg4orgxSd
1212
sil @_TFC4rect4Rectg4orgxSd : $@convention(method) (@guaranteed Rect) -> Double {
1313
bb0(%0 : $Rect):
1414
debug_value %0 : $Rect
@@ -19,7 +19,7 @@ bb0(%0 : $Rect):
1919
return %3 : $Double
2020
}
2121

22-
// CHECK_LABEL: sil_vtable Rect
22+
// CHECK-LABEL: sil_vtable Rect
2323
sil_vtable Rect {
2424
// CHECK: #Rect.orgx!getter
2525
#Rect.orgx!getter: @_TFC4rect4Rectg4orgxSd

‎test/SILGen/capture_resilience.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public func hasClosureVar() -> () -> ResilientStruct {
2929
@inlinable public func hasInlinableClosureLet() -> () -> ResilientStruct {
3030
let s = ResilientStruct()
3131

32-
// CHECK_LABEL: sil shared [serialized] [ossa] @$s18capture_resilience22hasInlinableClosureLetAA15ResilientStructVycyFADycfU_ : $@convention(thin) (@in_guaranteed ResilientStruct) -> @out ResilientStruct
32+
// CHECK-LABEL: sil shared [serialized] [ossa] @$s18capture_resilience22hasInlinableClosureLetAA15ResilientStructVycyFADycfU_ : $@convention(thin) (@in_guaranteed ResilientStruct) -> @out ResilientStruct
3333
return { s }
3434
}
3535

‎test/SILGen/init_delegation_optional.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ extension Optional where Wrapped == Optional<Bool> {
423423
self = .none
424424
}
425425

426-
// CHECK_LABEL: sil hidden [ossa] @$sSq24init_delegation_optionalSbSgRszlE13SpecFailable3ABSgSgyt_tcfC
426+
// CHECK-LABEL: sil hidden [ossa] @$sSq24init_delegation_optionalSbSgRszlE13SpecFailable3ABSgSgyt_tcfC
427427
init?(SpecFailable3: ()) {
428428
// CHECK: bb0([[SELF_META:%[0-9]+]] : $@thin Optional<Optional<Bool>>.Type):
429429
// CHECK-NEXT: [[SELF_BOX:%[0-9]+]] = alloc_box ${ var Optional<Optional<Bool>> }, var

‎test/SILGen/sil_locations.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func printSinglePayloadAddressOnly(_ v:SinglePayloadAddressOnly) {
313313
}
314314

315315

316-
// CHECK_LABEL: sil hidden [ossa] @$s13sil_locations29printSinglePayloadAddressOnly{{[_0-9a-zA-Z]*}}F
316+
// CHECK-LABEL: sil hidden [ossa] @$s13sil_locations29printSinglePayloadAddressOnly{{[_0-9a-zA-Z]*}}F
317317
// CHECK: bb0
318318
// CHECK: switch_enum_addr {{.*}} [[FALSE_BB:bb[0-9]+]], {{.*}}line:[[@LINE-10]]:3
319319
// CHECK: [[FALSE_BB]]:

‎test/SILGen/sil_locations_top_level.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var topLevelObject2:TopLevelObjectTyWithoutDestructor
3131
// CHECK: return {{.*}}// {{.*}} line:5:12
3232

3333
// Check explicit destructor
34-
// CHECK_LABEL: sil hidden [ossa] @$s23sil_locations_top_level16TopLevelObjectTyCfd
34+
// CHECK-LABEL: sil hidden [ossa] @$s23sil_locations_top_level16TopLevelObjectTyCfd
3535
// CHECK: return {{.*}}// {{.*}} line:8:3
3636

3737
// Check allocating constructor
@@ -44,5 +44,5 @@ var topLevelObject2:TopLevelObjectTyWithoutDestructor
4444
// CHECK: return {{.*}}// {{.*}} line:14:3:imp_return
4545

4646
// Check implicit destructor
47-
// CHECK_LABEL: sil hidden [ossa] @$s23sil_locations_top_level33TopLevelObjectTyWithoutDestructorCfd
47+
// CHECK-LABEL: sil hidden [ossa] @$s23sil_locations_top_level33TopLevelObjectTyWithoutDestructorCfd
4848
// CHECK: return {{.*}}// {{.*}} line:12:7:imp_return:auto_gen

0 commit comments

Comments
 (0)