Skip to content

tests: fix misspelled check prefixes #61978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 8, 2022
Merged

tests: fix misspelled check prefixes #61978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70981cf
tests: fix misspelled check prefixes
eeckstein Nov 8, 2022
5e870f2
tests: fix SILOptimizer/OSLogFullOptTest.swift
eeckstein Nov 8, 2022
624f946
tests: match optional `nonnull` attributes
eeckstein Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/AutoDiff/SILOptimizer/activity_analysis.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %target-swift-emit-sil -verify -Xllvm -debug-only=differentiation 2>&1 %s | %FileCheck %s
// RUN: %target-swift-emit-sil -verify -Xllvm -debug-only=differentiation %s 2>&1 | %FileCheck %s
// REQUIRES: asserts

import _Differentiation
Expand Down Expand Up @@ -456,7 +456,7 @@ func activeInoutArgMutatingMethodVar(_ nonactive: inout Mut, _ x: Mut) {
nonactive = result
}

// CHECK_LABEL: [AD] Activity info for ${{.*}}31activeInoutArgMutatingMethodVaryyAA3MutVz_ADtF at (parameters=(1) results=(0))
// CHECK-LABEL: [AD] Activity info for ${{.*}}31activeInoutArgMutatingMethodVaryyAA3MutVz_ADtF at parameter indices (1) and result indices (0)
// CHECK: [ACTIVE] %0 = argument of bb0 : $*Mut
// CHECK: [ACTIVE] %1 = argument of bb0 : $Mut
// CHECK: [ACTIVE] %4 = alloc_stack $Mut, var, name "result"
Expand Down
4 changes: 2 additions & 2 deletions test/Concurrency/Runtime/exclusivity.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,8 @@ struct Runner {
// CHECK-NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): (0x0, 0x0)
// CHECK-NEXT: Access. Pointer: [[ACCESS]]. PC:
// CHECK: Exiting Thread Local Context. After Swizzle. Task: [[TASK]]
// CHECK_NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): ([[LLNODE]], [[LLNODE]])
// CHECK_NEXT: No Accesses.
// CHECK-NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): ([[LLNODE]], [[LLNODE]])
// CHECK-NEXT: No Accesses.
//
// CHECK-NOT: Removing access:
// CHECK: ==> End Inner Task Handle
Expand Down
2 changes: 1 addition & 1 deletion test/Concurrency/async_main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func asyncFunc() async {


// async_Main
// CHECK-SIL_LABEL: sil hidden @async_Main : $@convention(thin) @async () -> () {
// CHECK-SIL-LABEL: sil hidden @async_Main : $@convention(thin) @async () -> () {
// call main
// CHECK-SIL: %0 = metatype $@thin MyProgram.Type // user: %2
// CHECK-SIL-NEXT: // function_ref static MyProgram.$main()
Expand Down
2 changes: 1 addition & 1 deletion test/DebugInfo/fnptr.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func main() -> Int64 {
baz_fnptr(2.89)

// CHECK-DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZPT:[0-9]+]]
// AST_DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZ_T:[0-9]+]]
// AST-DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZ_T:[0-9]+]]
// AST-DAG: ![[BARZ_T:[0-9]+]] = !DICompositeType({{.*}}, identifier: "$sS2fs5Int64VIegyyd_D")
// CHECK-DAG: ![[BARZPT]] = !DICompositeType(tag: DW_TAG_structure_type,{{.*}} elements: ![[BARZMEMBERS:[0-9]+]]
// CHECK-DAG: ![[BARZMEMBERS]] = !{![[BARZMEMBER:.*]], {{.*}}}
Expand Down
2 changes: 1 addition & 1 deletion test/IDE/complete_func_reference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ do {
}

// ANY_INT: Begin completions
// ANY_INT_DAG: Decl{{.*}}/TypeRelation[Convertible]: anyToInt(a:); name=anyToInt(a:)
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Convertible]: anyToInt(a:)[#(Any) -> Int#]; name=anyToInt(a:)
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: intToVoid({#a: Int#})[#Void#];
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: anyToVoid({#a: Any#})[#Void#];
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: voidToVoid()[#Void#];
Expand Down
2 changes: 1 addition & 1 deletion test/IDE/complete_keywords.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// KW_DECL-DAG: Keyword/None: override{{; name=.+$}}
// KW_DECL-DAG: Keyword/None: postfix{{; name=.+$}}
// KW_DECL-DAG: Keyword/None: prefix{{; name=.+$}}
// KW_DECL_DAG: Keyword[precedencegroup]: precedencegroup{{; name=.+$}}
// KW_DECL-DAG: Keyword[precedencegroup]: precedencegroup{{; name=.+$}}
// KW_DECL-DAG: Keyword[private]/None: private{{; name=.+$}}
// KW_DECL-DAG: Keyword[protocol]/None: protocol{{; name=.+$}}
// KW_DECL-DAG: Keyword[public]/None: public{{; name=.+$}}
Expand Down
10 changes: 5 additions & 5 deletions test/IDE/complete_property_delegate_attribute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ struct TestStruct {
// FIXME: No call patterns are suggested if we are completing in variable with multiple property wrappers (rdar://91480982)
func sync1() {}

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

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

// FIXME: No call patterns are suggested if we are completing in variable with multiple property wrappers (rdar://91480982)
func sync2() {}
Expand Down
14 changes: 7 additions & 7 deletions test/IDE/conforming-methods-basic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ func testing(obj: C) {
}

// CHECK_1: -----BEGIN CONFORMING METHOD LIST-----
// CHECK_1_NEXT: - TypeName: C
// CHECK_1_NEXT: - Members:
// CHECK_1_NEXT: - Name: returnsConcreteTarget1()
// CHECK_1_NEXT: TypeName: ConcreteTarget1
// CHECK_1_NEXT: - Name: returnsConcreteTarget1()
// CHECK_1_NEXT: TypeName: ConcreteTarget1
// CHECK_1_NEXT: -----END CONFORMING METHOD LIST-----
// CHECK_1-NEXT: - TypeName: C
// CHECK_1-NEXT: - Members:
// CHECK_1-NEXT: - Name: returnsConcreteTarget1()
// CHECK_1-NEXT: TypeName: ConcreteTarget1
// CHECK_1-NEXT: - Name: returnsConcreteTarget2()
// CHECK_1-NEXT: TypeName: ConcreteTarget2
// CHECK_1-NEXT: -----END CONFORMING METHOD LIST-----
2 changes: 1 addition & 1 deletion test/IRGen/closure.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func no_capture_descriptor(_ c: C, _ d: C, _ e: C, _ f: C, _ g: C) {
// CHECK-LABEL: define hidden swiftcc { i8*, %swift.refcounted* } @"$s7closure9letEscape1fyycyyXE_tF"(i8* %0, %swift.opaque* %1)
// CHECK: call zeroext i1 @swift_isEscapingClosureAtFileLocation(%swift.refcounted* {{.*}}, i8* getelementptr inbounds ({{.*}} [[FILENAME]]
// OPT-LABEL: define hidden swiftcc { i8*, %swift.refcounted* } @"$s7closure9letEscape1fyycyyXE_tF"(i8* %0, %swift.opaque* %1)
// OPT: call zeroext i1 @swift_isEscapingClosureAtFileLocation(%swift.refcounted* {{.*}}, i8* getelementptr inbounds ({{.*}} [[FILENAME]]
// OPT: call zeroext i1 @swift_isEscapingClosureAtFileLocation(%swift.refcounted* {{.*}}, i8* {{(nonnull )?}}getelementptr inbounds ({{.*}} [[FILENAME]]
func letEscape(f: () -> ()) -> () -> () {
return withoutActuallyEscaping(f) { return $0 }
}
2 changes: 1 addition & 1 deletion test/IRGen/dllexport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ open class d {
// CHECK-DAG: define dllexport swiftcc %swift.refcounted* @"$s9dllexport1cCfd"(%T9dllexport1cC*{{.*}})
// CHECK-DAG-NO-OPT: define dllexport swiftcc %T9dllexport1cC* @"$s9dllexport1cCACycfc"(%T9dllexport1cC* %0)
// CHECK-DAG-NO-OPT: define dllexport swiftcc %T9dllexport1cC* @"$s9dllexport1cCACycfC"(%swift.type* %0)
// CHECK-DAG: define dllexport swiftcc i8* @"$s9dllexport2ciAA1cCvau"()
// CHECK-DAG: define dllexport swiftcc {{(nonnull )?}}i8* @"$s9dllexport2ciAA1cCvau"()
// CHECK-DAG-NO-OPT: define dllexport swiftcc void @"$s9dllexport1dC1m33_C57BA610BA35E21738CC992438E660E9LLyyF"(%T9dllexport1dC* %0)
// CHECK-DAG-NO-OPT: define dllexport swiftcc void @"$s9dllexport1dCfD"(%T9dllexport1dC* %0)
// CHECK-DAG: define dllexport swiftcc %swift.refcounted* @"$s9dllexport1dCfd"(%T9dllexport1dC*{{.*}})
Expand Down
4 changes: 1 addition & 3 deletions test/IRGen/reflection_metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
// RUN: %target-swift-frontend -disable-reflection-names -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
// RUN: %target-swift-frontend -disable-reflection-metadata -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA

// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_reflect|.sw5rfst\$B}}
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_fieldmd|.sw5flmd\$B}}
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_assocty|.sw5asty\$B}}
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_assocty|.sw5asty\$B}}
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_capture|.sw5cptr\$B}}
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_typeref|.sw5tyrf\$B}}
// STRIP_REFLECTION_NAMES-DAG: private constant [6 x i8] c"Inner\00", section "{{[^"]*swift5_reflstr|.sw5rfst\$B}}
Expand Down
2 changes: 1 addition & 1 deletion test/Interop/SwiftToC/structs/large-structs-pass-return-indirect-in-c.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public struct StructSeveralI64 {
// CHECK-NEXT: _Alignas(8) char _storage[40];
// CHECK-NEXT: };

// CHECK_NOT: swift_interop
// CHECK-NOT: swift_interop

public func returnNewStructSeveralI64(i: Int64) -> StructSeveralI64 {
return StructSeveralI64(x1: i, x2: 0, x3: -17, x4: 12345612, x5: -0xFFFF)
Expand Down
12 changes: 6 additions & 6 deletions test/Interop/SwiftToC/structs/small-structs-64-bit-pass-return-direct-in-c.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ public struct StructI8AndU32AndI16 {
}

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

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

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

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

Expand Down
12 changes: 6 additions & 6 deletions test/Interop/SwiftToC/structs/small-structs-pass-return-direct-in-c.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ public struct StructDoubleAndFloat {
}

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

// CHECK: struct Structs_StructOneI64 {
// CHECK_NEXT: _Alignas(8) char _storage[8];
// CHECK_NEXT: };
// CHECK-NEXT: _Alignas(8) char _storage[8];
// CHECK-NEXT: };

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

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

Expand Down
4 changes: 2 additions & 2 deletions test/SIL/Parser/stored_property.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Rect {
init(orgx: Double)
}

// CHECK_LABEL: sil @_TFC4rect4Rectg4orgxSd
// CHECK-LABEL: sil @_TFC4rect4Rectg4orgxSd
sil @_TFC4rect4Rectg4orgxSd : $@convention(method) (@guaranteed Rect) -> Double {
bb0(%0 : $Rect):
debug_value %0 : $Rect
Expand All @@ -19,7 +19,7 @@ bb0(%0 : $Rect):
return %3 : $Double
}

// CHECK_LABEL: sil_vtable Rect
// CHECK-LABEL: sil_vtable Rect
sil_vtable Rect {
// CHECK: #Rect.orgx!getter
#Rect.orgx!getter: @_TFC4rect4Rectg4orgxSd
Expand Down
2 changes: 1 addition & 1 deletion test/SILGen/capture_resilience.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public func hasClosureVar() -> () -> ResilientStruct {
@inlinable public func hasInlinableClosureLet() -> () -> ResilientStruct {
let s = ResilientStruct()

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

Expand Down
2 changes: 1 addition & 1 deletion test/SILGen/init_delegation_optional.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ extension Optional where Wrapped == Optional<Bool> {
self = .none
}

// CHECK_LABEL: sil hidden [ossa] @$sSq24init_delegation_optionalSbSgRszlE13SpecFailable3ABSgSgyt_tcfC
// CHECK-LABEL: sil hidden [ossa] @$sSq24init_delegation_optionalSbSgRszlE13SpecFailable3ABSgSgyt_tcfC
init?(SpecFailable3: ()) {
// CHECK: bb0([[SELF_META:%[0-9]+]] : $@thin Optional<Optional<Bool>>.Type):
// CHECK-NEXT: [[SELF_BOX:%[0-9]+]] = alloc_box ${ var Optional<Optional<Bool>> }, var
Expand Down
2 changes: 1 addition & 1 deletion test/SILGen/sil_locations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func printSinglePayloadAddressOnly(_ v:SinglePayloadAddressOnly) {
}


// CHECK_LABEL: sil hidden [ossa] @$s13sil_locations29printSinglePayloadAddressOnly{{[_0-9a-zA-Z]*}}F
// CHECK-LABEL: sil hidden [ossa] @$s13sil_locations29printSinglePayloadAddressOnly{{[_0-9a-zA-Z]*}}F
// CHECK: bb0
// CHECK: switch_enum_addr {{.*}} [[FALSE_BB:bb[0-9]+]], {{.*}}line:[[@LINE-10]]:3
// CHECK: [[FALSE_BB]]:
Expand Down
4 changes: 2 additions & 2 deletions test/SILGen/sil_locations_top_level.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var topLevelObject2:TopLevelObjectTyWithoutDestructor
// CHECK: return {{.*}}// {{.*}} line:5:12

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

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

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