Skip to content

Commit 509a781

Browse files
committed
[test] Rename a test file
And rename the functions in it
1 parent 1b8e475 commit 509a781

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

test/Profiler/coverage_exceptions.swift renamed to test/Profiler/coverage_errors.swift

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
struct S {
55
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.S.init() -> coverage_catch.S
6-
init() { // CHECK: [[@LINE]]:10 -> [[@LINE+6]]:4 : 0
7-
do { // CHECK: [[@LINE]]:8 -> [[@LINE+2]]:6 : 0
6+
init() { // CHECK: [[@LINE]]:10 -> [[@LINE+6]]:4 : 0
7+
do { // CHECK: [[@LINE]]:8 -> [[@LINE+2]]:6 : 0
88
throw SomeErr.Err1
99
} catch {
1010
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:6 : 1
@@ -17,14 +17,14 @@ enum SomeErr : Error {
1717
case Err2
1818
}
1919

20-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.bar
21-
func bar() throws {
22-
// CHECK-NEXT: [[@LINE-1]]:19 -> [[@LINE+2]]:2 : 0
20+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test1
21+
func test1() throws {
22+
// CHECK-NEXT: [[@LINE-1]]:21 -> [[@LINE+2]]:2 : 0
2323
throw SomeErr.Err2
2424
} // CHECK-NEXT: }
2525

26-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.baz
27-
func baz(_ fn: () throws -> ()) rethrows {
26+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test2
27+
func test2(_ fn: () throws -> ()) rethrows {
2828
do {
2929
try fn()
3030
} catch SomeErr.Err1 { // CHECK: [[@LINE]]:24 -> {{[0-9]+}}:4 : 1
@@ -34,8 +34,8 @@ func baz(_ fn: () throws -> ()) rethrows {
3434
try fn()
3535
} // CHECK-NEXT: }
3636

37-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.foo
38-
func foo() -> Int32 {
37+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test3
38+
func test3() -> Int32 {
3939
var x : Int32 = 0
4040

4141
do {
@@ -48,41 +48,41 @@ func foo() -> Int32 {
4848
} // CHECK: [[@LINE]]:4 -> {{[0-9:]+}} : 0
4949

5050
do {
51-
try baz(bar)
51+
try test2(test1)
5252
} catch _ {
5353
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:4 : 3
5454
} // CHECK: [[@LINE]]:4 -> {{[0-9:]+}} : 0
5555

5656
do {
57-
try baz { () throws -> () in throw SomeErr.Err1 }
57+
try test2 { () throws -> () in throw SomeErr.Err1 }
5858
} catch _ {}
5959

60-
try! baz { () throws -> () in return }
60+
try! test2 { () throws -> () in return }
6161

6262
return x
6363
}
6464

65-
let _ = foo()
65+
let _ = test3()
6666

6767
// rdar://34244637 - Coverage after a do-catch is incorrect
68-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.goo
69-
func goo(_ b: Bool) -> Int { // CHECK-NEXT: [[@LINE]]:28 {{.*}} : 0
70-
do { // CHECK-NEXT: [[@LINE]]:6 -> [[@LINE+2]]:4 : 0
68+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test4
69+
func test4(_ b: Bool) -> Int { // CHECK-NEXT: [[@LINE]]:30 {{.*}} : 0
70+
do { // CHECK-NEXT: [[@LINE]]:6 -> [[@LINE+2]]:4 : 0
7171
throw SomeErr.Err1
72-
} catch { // CHECK-NEXT: [[@LINE]]:11 {{.*}} : 1
73-
// CHECK-NEXT: [[@LINE+1]]:8 {{.*}} : 1
74-
if b { // CHECK-NEXT: [[@LINE]]:10 {{.*}} : 2
72+
} catch { // CHECK-NEXT: [[@LINE]]:11 {{.*}} : 1
73+
// CHECK-NEXT: [[@LINE+1]]:8 {{.*}} : 1
74+
if b { // CHECK-NEXT: [[@LINE]]:10 {{.*}} : 2
7575
return 1
76-
} // CHECK-NEXT: [[@LINE]]:6 {{.*}} : (1 - 2)
77-
} // CHECK: [[@LINE]]:4 {{.*}} : (0 - 2)
76+
} // CHECK-NEXT: [[@LINE]]:6 {{.*}} : (1 - 2)
77+
} // CHECK: [[@LINE]]:4 {{.*}} : (0 - 2)
7878
return 0
7979
}
8080

8181
// Test coverage with nested do-catches
82-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.hoo
83-
func hoo() -> Int {
82+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test5
83+
func test5() -> Int {
8484
do {
85-
try bar()
85+
try test1()
8686
do {
8787
throw SomeErr.Err1
8888
} catch {
@@ -96,8 +96,8 @@ func hoo() -> Int {
9696
}
9797

9898
// Test coverage with a do-catch inside of a repeat-while
99-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.ioo
100-
func ioo() -> Int {
99+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test6
100+
func test6() -> Int {
101101
repeat { // CHECK: [[@LINE]]:10 {{.*}} : 1
102102
do {
103103
throw SomeErr.Err1
@@ -110,11 +110,11 @@ func ioo() -> Int {
110110
}
111111

112112
// Test coverage with a break inside a do-catch inside of a repeat-while
113-
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.joo
114-
func joo() -> Int {
113+
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.test7
114+
func test7() -> Int {
115115
repeat { // CHECK: [[@LINE]]:10 {{.*}} : 1
116116
do {
117-
try bar()
117+
try test1()
118118
} catch { // CHECK: [[@LINE]]:13 {{.*}} : 2
119119
break
120120
} // CHECK: [[@LINE]]:6 {{.*}} : (1 - 2)
@@ -124,12 +124,12 @@ func joo() -> Int {
124124
}
125125

126126
// rdar://41010883 – Make sure we don't introduce an empty unreachable region.
127-
// CHECK-LABEL: sil_coverage_map {{.*}} "$s14coverage_catch3kooSiyKF" {{.*}} // coverage_catch.koo
128-
func koo() throws -> Int { // CHECK-NEXT: [[@LINE]]:26 -> [[@LINE+7]]:2 : 0
129-
do { // CHECK-NEXT: [[@LINE]]:6 -> [[@LINE+3]]:4 : 0
130-
try bar()
127+
// CHECK-LABEL: sil_coverage_map {{.*}} "$s14coverage_catch5test8SiyKF"
128+
func test8() throws -> Int { // CHECK-NEXT: [[@LINE]]:28 -> [[@LINE+7]]:2 : 0
129+
do { // CHECK-NEXT: [[@LINE]]:6 -> [[@LINE+3]]:4 : 0
130+
try test1()
131131
return 1
132-
} catch is SomeErr { // CHECK-NEXT: [[@LINE]]:22 -> [[@LINE+2]]:4 : 1
132+
} catch is SomeErr { // CHECK-NEXT: [[@LINE]]:22 -> [[@LINE+2]]:4 : 1
133133
throw SomeErr.Err1
134134
}
135-
} // CHECK-NEXT: }
135+
} // CHECK-NEXT: }

0 commit comments

Comments
 (0)