averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Coverage] Fix mappings of regions following do-catch stmts

Browse Source 
Coverage reporting for source regions following do-catch statements was
incorrect, because it did not properly reflect early exits.

rdar://34244637
This commit is contained in:
Vedant Kumar
2018-05-18 12:11:07 -07:00
parent 2f5bed40da
commit d3ea09fafc
6 changed files with 136 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
test/Profiler/coverage_exceptions.swift
View File

@@ -15,9 +15,9 @@ func bar() throws {
func baz(_ fn: () throws -> ()) rethrows {
do {
try fn()
} catch SomeErr.Err1 { // CHECK: [[@LINE]]:24 -> {{[0-9]+}}:4 : 2
} catch SomeErr.Err1 { // CHECK: [[@LINE]]:24 -> {{[0-9]+}}:4 : 1
return
} // CHECK-NEXT: [[@LINE]]:4 -> {{[0-9]+}}:2 : 1
} // CHECK-NEXT: [[@LINE]]:4 -> {{[0-9]+}}:2 : (0 - 1)
try fn()
} // CHECK-NEXT: }
@@ -30,16 +30,16 @@ func foo() -> Int32 {
throw SomeErr.Err1
x += 2 // [[@LINE]]:5 -> [[@LINE+1]]:4 : zero
} catch SomeErr.Err1 {
// CHECK: [[@LINE-1]]:24 -> [[@LINE+1]]:4 : 2
// CHECK: [[@LINE-1]]:24 -> [[@LINE+1]]:4 : 1
} catch _ {
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:4 : 3
} // CHECK: [[@LINE]]:4 -> {{[0-9:]+}} : 1
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:4 : 2
} // CHECK: [[@LINE]]:4 -> {{[0-9:]+}} : 0
do {
try baz(bar)
} catch _ {
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:4 : 5
} // CHECK: [[@LINE]]:4 -> {{[0-9:]+}} : 4
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:4 : 3
} // CHECK: [[@LINE]]:4 -> {{[0-9:]+}} : 0
do {
try baz { () throws -> () in throw SomeErr.Err1 }
@@ -50,7 +50,65 @@ func foo() -> Int32 {
return x
}
foo()
let _ = foo()
// rdar://34244637 - Coverage after a do-catch is incorrect
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.goo
func goo(_ b: Bool) -> Int { // CHECK-NEXT: [[@LINE]]:28 {{.*}} : 0
do { // CHECK-NEXT: [[@LINE]]:6 -> [[@LINE+2]]:4 : 0
throw SomeErr.Err1
} catch { // CHECK-NEXT: [[@LINE]]:11 {{.*}} : 1
if b { // CHECK-NEXT: [[@LINE]]:10 {{.*}} : 2
return 1
} // CHECK-NEXT: [[@LINE]]:6 {{.*}} : (1 - 2)
} // CHECK: [[@LINE]]:4 {{.*}} : (0 - 2)
return 0
}
// Test coverage with nested do-catches
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.hoo
func hoo() -> Int {
do {
try bar()
do {
throw SomeErr.Err1
} catch {
return 0
} // CHECK: [[@LINE]]:6 {{.*}} : (0 - 1)
} catch {
return 1
} // CHECK: [[@LINE]]:4 {{.*}} : ((0 - 1) - 2)
}
// Test coverage with a do-catch inside of a repeat-while
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.ioo
func ioo() -> Int {
repeat { // CHECK: [[@LINE]]:10 {{.*}} : 1
do {
throw SomeErr.Err1
} catch { // CHECK: [[@LINE]]:13 {{.*}} : 2
return 0
} // CHECK: [[@LINE]]:6 {{.*}} : (1 - 2)
} while false // CHECK: [[@LINE]]:11 {{.*}} : (1 - 2)
return 1
}
// Test coverage with a break inside a do-catch inside of a repeat-while
// CHECK-LABEL: sil_coverage_map {{.*}}// coverage_catch.joo
func joo() -> Int {
repeat { // CHECK: [[@LINE]]:10 {{.*}} : 1
do {
try bar()
} catch { // CHECK: [[@LINE]]:13 {{.*}} : 2
break
} // CHECK: [[@LINE]]:6 {{.*}} : (1 - 2)
} while false // CHECK: [[@LINE]]:11 {{.*}} : (1 - 2)
return 1
}
struct S {
// CHECK: sil_coverage_map {{.*}}// __ntd_S_line:[[@LINE-1]]
@@ -58,7 +116,7 @@ struct S {
do {
throw SomeErr.Err1
} catch {
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:6 : 2
} // CHECK: [[@LINE]]:6 -> [[@LINE+1]]:4 : 1
// CHECK: [[@LINE-1]]:13 -> [[@LINE+1]]:6 : 1
} // CHECK: [[@LINE]]:6 -> [[@LINE+1]]:4 : 0
}
}