Merge pull request #61978 from eeckstein/test-fixes

tests: fix misspelled check prefixes

Author: eeckstein

test/AutoDiff/SILOptimizer/activity_analysis.swift

@@ -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
@@ -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"

test/Concurrency/Runtime/exclusivity.swift

@@ -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

test/Concurrency/async_main.swift

@@ -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()

test/DebugInfo/fnptr.swift

@@ -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:.*]], {{.*}}}

test/IDE/complete_func_reference.swift

@@ -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#];

test/IDE/complete_keywords.swift

@@ -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=.+$}}

test/IDE/complete_property_delegate_attribute.swift

@@ -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() {}

test/IDE/conforming-methods-basic.swift

@@ -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-----

test/IRGen/closure.swift

@@ -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 }
 }

test/IRGen/dllexport.swift

@@ -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*{{.*}})