Merge pull request #23682 from bob-wilson/llvm-r356789

master-next: adjust test output for change in LLVM block syntax

Author: bob-wilson

test/DebugInfo/dbgvalue-insertpt.swift

@@ -9,10 +9,10 @@ for i in 0 ..< 3 {
   // CHECK: %[[LD:[0-9]+]] = load i{{32|64}}, i{{32|64}}*
   // CHECK: br i1 {{%.*}}, label %[[FAIL:.*]], label %[[SUCCESS:.*]],
   //
-  // CHECK: ; <label>:[[SUCCESS]]:
+  // CHECK: [[SUCCESS]]:
   // CHECK: br label %[[NEXT_BB:.*]],
   //
-  // CHECK: ; <label>:[[NEXT_BB]]:
+  // CHECK: [[NEXT_BB]]:
   // CHECK: %[[PHI_VAL:.*]] = phi i{{32|64}} [ %[[LD]], %[[SUCCESS]] ]
   // CHECK: store i{{32|64}} %[[PHI_VAL]], i{{32|64}}* %i.debug
   // CHECK: ![[I]] = !DILocalVariable(name: "i",

test/DebugInfo/linetable-cleanups.swift

@@ -19,7 +19,7 @@ func main() {
     markUsed("Done with the for loop")
 // CHECK: call {{.*}}void @"$s4main8markUsedyyxlF"
 // CHECK: br label
-// CHECK: <label>:
+// CHECK: {{[0-9]+}}:
 // CHECK: call %Ts16IndexingIteratorVySaySiGG* @"$ss16IndexingIteratorVySaySiGGWOh"(%Ts16IndexingIteratorVySaySiGG* %{{.*}}), !dbg ![[LOOPHEADER_LOC:.*]]
 // CHECK: call {{.*}}void @"$s4main8markUsedyyxlF"
 // The cleanups should share the line number with the ret stmt.

test/DebugInfo/linetable-codeview.swift

@@ -62,7 +62,7 @@ func foo() {
   // CHECK: br label %[[RETLABEL:[0-9]+]], !dbg ![[CASE:[0-9]+]]
   // CHECK: call { i64, i1 } @llvm.sadd.with.overflow.i64{{.*}}
   // CHECK: br label %[[RETLABEL]], !dbg ![[DEFAULTCLEANUP:[0-9]+]]
-  // CHECK: ; <label>:[[RETLABEL]]:
+  // CHECK: [[RETLABEL]]:
   // CHECK-NEXT: ret void
 
 // func foo()

test/DebugInfo/patternvars.swift

@@ -36,22 +36,22 @@ public func mangle(s: [UnicodeScalar]) -> [UnicodeScalar] {
 // CHECK: define {{.*}}@"$s11patternvars6mangle1sSayAA13UnicodeScalarVGAF_tFA2EXEfU_"
 // CHECK: %[[VAL:[0-9]+]] = call swiftcc i32 @"$s11patternvars13UnicodeScalarV5values6UInt32Vvg"(i32 %0)
 // CHECK-NEXT:  call void @llvm.dbg.value(metadata i32 %[[VAL]]
-// CHECK:       ; <label>
+// CHECK:       {{[0-9]+}}:
 // CHECK:       call void @llvm.dbg.value(metadata i32 %[[VAL]]
 // CHECK-NOT:   call void @llvm.dbg.value
 // CHECK-NOT:   call void asm sideeffect "", "r"
 
-// CHECK:       ; <label>
+// CHECK:       {{[0-9]+}}:
 // CHECK:       call void @llvm.dbg.value(metadata i32 %[[VAL]]
 // CHECK-NOT:   call void @llvm.dbg.value
 // CHECK-NOT:   call void asm sideeffect "", "r"
 
-// CHECK:       ; <label>
+// CHECK:       {{[0-9]+}}:
 // CHECK:       call void @llvm.dbg.value(metadata i32 %[[VAL]]
 // CHECK-NOT:   call void @llvm.dbg.value
 // CHECK-NOT:   call void asm sideeffect "", "r"
 
-// CHECK:       ; <label>
+// CHECK:       {{[0-9]+}}:
 // CHECK:       call void @llvm.dbg.value(metadata i32 %[[VAL]]
 // CHECK-NOT:   call void @llvm.dbg.value
 // CHECK-NOT:   call void asm sideeffect "", "r"

test/IRGen/abi_v7k.swift

@@ -201,7 +201,7 @@ func testMultiP(x: MultiPayload) -> Double {
 // CHECK: entry:
 // CHECK: [[TR:%.*]] = trunc i8 %1
 // CHECK: br i1 [[TR]], {{.*}}, label %[[PAYLOADLABEL:.*]]
-// CHECK: <label>:[[PAYLOADLABEL]]
+// CHECK: [[PAYLOADLABEL]]:
 // CHECK: [[ID:%[0-9]+]] = bitcast i32 %0 to float
 // CHECK: ret float
 // V7K-LABEL: _$s8test_v7k0A3Opt

test/IRGen/builtins.swift

@@ -316,17 +316,17 @@ func testStaticReport(_ b: Bool, ptr: Builtin.RawPointer) -> () {
 func testCondFail(_ b: Bool, c: Bool) {
   // CHECK: br i1 %0, label %[[FAIL:.*]], label %[[CONT:.*]]
   Builtin.condfail(b)
-  // CHECK: <label>:[[CONT]]
+  // CHECK: [[CONT]]:
   // CHECK: br i1 %1, label %[[FAIL2:.*]], label %[[CONT:.*]]
   Builtin.condfail(c)
-  // CHECK: <label>:[[CONT]]
+  // CHECK: [[CONT]]:
   // CHECK: ret void
 
-  // CHECK: <label>:[[FAIL]]
+  // CHECK: [[FAIL]]:
   // CHECK: call void @llvm.trap()
   // CHECK: unreachable
 
-  // CHECK: <label>:[[FAIL2]]
+  // CHECK: [[FAIL2]]:
   // CHECK: call void @llvm.trap()
   // CHECK: unreachable
 }