Skip to content

[Coverage] Add gap region between binary operator '&& and ||' and RHS #149085

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
Aug 8, 2025
Merged

[Coverage] Add gap region between binary operator '&& and ||' and RHS #149085

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
763293b
[llvm-cov] Add gap region after binary operator && and ||
int-zjt Jul 16, 2025
5482444
Fix format
int-zjt Jul 17, 2025
f7929d7
Fix coverage mapping logical test
int-zjt Jul 17, 2025
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
10 changes: 10 additions & 0 deletions clang/lib/CodeGen/CoverageMappingGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,6 +2269,11 @@ struct CounterCoverageMappingBuilder
// Track LHS True/False Decision.
const auto DecisionLHS = MCDCBuilder.pop();

if (auto Gap =
findGapAreaBetween(getEnd(E->getLHS()), getStart(E->getRHS()))) {
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), getRegionCounter(E));
}

// Counter tracks the right hand side of a logical and operator.
extendRegion(E->getRHS());
propagateCounts(getRegionCounter(E), E->getRHS());
Expand Down Expand Up @@ -2330,6 +2335,11 @@ struct CounterCoverageMappingBuilder
// Track LHS True/False Decision.
const auto DecisionLHS = MCDCBuilder.pop();

if (auto Gap =
findGapAreaBetween(getEnd(E->getLHS()), getStart(E->getRHS()))) {
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), getRegionCounter(E));
}

// Counter tracks the right hand side of a logical or operator.
extendRegion(E->getRHS());
propagateCounts(getRegionCounter(E), E->getRHS());
Expand Down
22 changes: 13 additions & 9 deletions clang/test/CoverageMapping/logical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name logical.cpp %s | FileCheck %s
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fcoverage-mcdc -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name logical.cpp %s | FileCheck %s -check-prefix=MCDC

int main() { // CHECK: File 0, [[@LINE]]:12 -> [[@LINE+23]]:2 = #0
int main() { // CHECK: File 0, [[@LINE]]:12 -> [[@LINE+27]]:2 = #0
bool bt = true;
bool bf = false; // MCDC: Decision,File 0, [[@LINE+1]]:12 -> [[@LINE+1]]:20 = M:3, C:2
bool a = bt && bf; // CHECK-NEXT: File 0, [[@LINE]]:12 -> [[@LINE]]:14 = #0
// CHECK-NEXT: Branch,File 0, [[@LINE-1]]:12 -> [[@LINE-1]]:14 = #1, (#0 - #1)
// CHECK-NEXT: File 0, [[@LINE-2]]:18 -> [[@LINE-2]]:20 = #1
// CHECK-NEXT: Branch,File 0, [[@LINE-3]]:18 -> [[@LINE-3]]:20 = #2, (#1 - #2)
// CHECK-NEXT: Gap,File 0, [[@LINE-2]]:14 -> [[@LINE-2]]:18 = #1
// CHECK-NEXT: File 0, [[@LINE-3]]:18 -> [[@LINE-3]]:20 = #1
// CHECK-NEXT: Branch,File 0, [[@LINE-4]]:18 -> [[@LINE-4]]:20 = #2, (#1 - #2)
// MCDC: Decision,File 0, [[@LINE+1]]:7 -> [[@LINE+2]]:9 = M:6, C:2
a = bt && // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:9 = #0
bf; // CHECK-NEXT: Branch,File 0, [[@LINE-1]]:7 -> [[@LINE-1]]:9 = #3, (#0 - #3)
// CHECK-NEXT: File 0, [[@LINE-1]]:7 -> [[@LINE-1]]:9 = #3
// CHECK-NEXT: Branch,File 0, [[@LINE-2]]:7 -> [[@LINE-2]]:9 = #4, (#3 - #4)
// CHECK-NEXT: Gap,File 0, [[@LINE-2]]:9 -> [[@LINE-1]]:7 = #3
// CHECK-NEXT: File 0, [[@LINE-2]]:7 -> [[@LINE-2]]:9 = #3
// CHECK-NEXT: Branch,File 0, [[@LINE-3]]:7 -> [[@LINE-3]]:9 = #4, (#3 - #4)
// MCDC: Decision,File 0, [[@LINE+1]]:7 -> [[@LINE+1]]:15 = M:9, C:2
a = bf || bt; // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:9 = #0
// CHECK-NEXT: Branch,File 0, [[@LINE-1]]:7 -> [[@LINE-1]]:9 = (#0 - #5), #5
// CHECK-NEXT: File 0, [[@LINE-2]]:13 -> [[@LINE-2]]:15 = #5
// CHECK-NEXT: Branch,File 0, [[@LINE-3]]:13 -> [[@LINE-3]]:15 = (#5 - #6), #6
// CHECK-NEXT: Gap,File 0, [[@LINE-2]]:9 -> [[@LINE-2]]:13 = #5
// CHECK-NEXT: File 0, [[@LINE-3]]:13 -> [[@LINE-3]]:15 = #5
// CHECK-NEXT: Branch,File 0, [[@LINE-4]]:13 -> [[@LINE-4]]:15 = (#5 - #6), #6
// MCDC: Decision,File 0, [[@LINE+1]]:7 -> [[@LINE+2]]:9 = M:12, C:2
a = bf || // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:9 = #0
bt; // CHECK-NEXT: Branch,File 0, [[@LINE-1]]:7 -> [[@LINE-1]]:9 = (#0 - #7), #7
// CHECK-NEXT: File 0, [[@LINE-1]]:7 -> [[@LINE-1]]:9 = #7
// CHECK-NEXT: Branch,File 0, [[@LINE-2]]:7 -> [[@LINE-2]]:9 = (#7 - #8), #8
// CHECK-NEXT: Gap,File 0, [[@LINE-2]]:9 -> [[@LINE-1]]:7 = #7
// CHECK-NEXT: File 0, [[@LINE-2]]:7 -> [[@LINE-2]]:9 = #7
// CHECK-NEXT: Branch,File 0, [[@LINE-3]]:7 -> [[@LINE-3]]:9 = (#7 - #8), #8
return 0;
}
36 changes: 36 additions & 0 deletions compiler-rt/test/profile/Linux/coverage_short_circuit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// RUN: %clangxx_profgen -std=c++17 -fuse-ld=lld -fcoverage-mapping -o %t %s
// RUN: env LLVM_PROFILE_FILE=%t.profraw %run %t
// RUN: llvm-profdata merge -o %t.profdata %t.profraw
// RUN: llvm-cov show %t -instr-profile=%t.profdata 2>&1 | FileCheck %s

void foo() { // CHECK: [[@LINE]]| 1|void foo() {
bool cond1 = false; // CHECK-NEXT: [[@LINE]]| 1| bool cond1 = false;
bool cond2 = true; // CHECK-NEXT: [[@LINE]]| 1| bool cond2 = true;
if (cond1 && // CHECK-NEXT: [[@LINE]]| 1| if (cond1 &&
cond2) { // CHECK-NEXT: [[@LINE]]| 0| cond2) {
} // CHECK-NEXT: [[@LINE]]| 0| }
} // CHECK-NEXT: [[@LINE]]| 1|}

void bar() { // CHECK: [[@LINE]]| 1|void bar() {
bool cond1 = true; // CHECK-NEXT: [[@LINE]]| 1| bool cond1 = true;
bool cond2 = false; // CHECK-NEXT: [[@LINE]]| 1| bool cond2 = false;
if (cond1 && // CHECK-NEXT: [[@LINE]]| 1| if (cond1 &&
cond2) { // CHECK-NEXT: [[@LINE]]| 1| cond2) {
} // CHECK-NEXT: [[@LINE]]| 0| }
} // CHECK-NEXT: [[@LINE]]| 1|}

void baz() { // CHECK: [[@LINE]]| 1|void baz() {
bool cond1 = false; // CHECK-NEXT: [[@LINE]]| 1| bool cond1 = false;
bool cond2 = true; // CHECK-NEXT: [[@LINE]]| 1| bool cond2 = true;
if (cond1 // CHECK-NEXT: [[@LINE]]| 1| if (cond1
&& // CHECK-NEXT: [[@LINE]]| 0| &&
cond2) { // CHECK-NEXT: [[@LINE]]| 0| cond2) {
} // CHECK-NEXT: [[@LINE]]| 0| }
} // CHECK-NEXT: [[@LINE]]| 1|}

int main() {
foo();
bar();
baz();
return 0;
}