Skip to content

Commit a31c89c

Browse files
ZequanWuZequanWu
committed
[Coverage] Enable emitting gap area between macros
Differential Revision: https://reviews.llvm.org/D85176
1 parent fc544dc commit a31c89c

File tree

7 files changed

+34
-36
lines changed

7 files changed

+34
-36
lines changed

‎clang/lib/CodeGen/CoverageMappingGen.cpp

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -864,22 +864,13 @@ struct CounterCoverageMappingBuilder
864864
/// Find a valid gap range between \p AfterLoc and \p BeforeLoc.
865865
Optional<SourceRange> findGapAreaBetween(SourceLocation AfterLoc,
866866
SourceLocation BeforeLoc) {
867-
// If the start and end locations of the gap are both within the same macro
868-
// file, the range may not be in source order.
869-
if (AfterLoc.isMacroID() || BeforeLoc.isMacroID())
870-
return None;
867+
AfterLoc = SM.getExpansionLoc(AfterLoc);
868+
BeforeLoc = SM.getExpansionLoc(BeforeLoc);
871869
if (!SM.isWrittenInSameFile(AfterLoc, BeforeLoc))
872870
return None;
873871
return {{AfterLoc, BeforeLoc}};
874872
}
875873

876-
/// Find the source range after \p AfterStmt and before \p BeforeStmt.
877-
Optional<SourceRange> findGapAreaBetween(const Stmt *AfterStmt,
878-
const Stmt *BeforeStmt) {
879-
return findGapAreaBetween(getPreciseTokenLocEnd(getEnd(AfterStmt)),
880-
getStart(BeforeStmt));
881-
}
882-
883874
/// Emit a gap region between \p StartLoc and \p EndLoc with the given count.
884875
void fillGapAreaWithCount(SourceLocation StartLoc, SourceLocation EndLoc,
885876
Counter Count) {
@@ -1044,7 +1035,8 @@ struct CounterCoverageMappingBuilder
10441035
adjustForOutOfOrderTraversal(getEnd(S));
10451036

10461037
// The body count applies to the area immediately after the increment.
1047-
auto Gap = findGapAreaBetween(S->getCond(), S->getBody());
1038+
auto Gap = findGapAreaBetween(getPreciseTokenLocEnd(S->getRParenLoc()),
1039+
getStart(S->getBody()));
10481040
if (Gap)
10491041
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), BodyCount);
10501042

@@ -1261,7 +1253,8 @@ struct CounterCoverageMappingBuilder
12611253
propagateCounts(ParentCount, S->getCond());
12621254

12631255
// The 'then' count applies to the area immediately after the condition.
1264-
auto Gap = findGapAreaBetween(S->getCond(), S->getThen());
1256+
auto Gap = findGapAreaBetween(getPreciseTokenLocEnd(S->getRParenLoc()),
1257+
getStart(S->getThen()));
12651258
if (Gap)
12661259
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), ThenCount);
12671260

@@ -1271,7 +1264,8 @@ struct CounterCoverageMappingBuilder
12711264
Counter ElseCount = subtractCounters(ParentCount, ThenCount);
12721265
if (const Stmt *Else = S->getElse()) {
12731266
// The 'else' count applies to the area immediately after the 'then'.
1274-
Gap = findGapAreaBetween(S->getThen(), Else);
1267+
Gap = findGapAreaBetween(getPreciseTokenLocEnd(getEnd(S->getThen())),
1268+
getStart(Else));
12751269
if (Gap)
12761270
fillGapAreaWithCount(Gap->getBegin(), Gap->getEnd(), ElseCount);
12771271
extendRegion(Else);

‎clang/test/CoverageMapping/if.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,3 @@ int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 =
4444

4545
return 0;
4646
}
47-
48-
#define FOO true
49-
50-
// CHECK-LABEL: _Z7ternaryv:
51-
void ternary() {
52-
true ? FOO : FOO; // CHECK-NOT: Gap,{{.*}}, [[@LINE]]:8 ->
53-
}

‎clang/test/CoverageMapping/macro-expressions.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ void foo(int i) {
5757
// CHECK: File 0, [[@LINE+1]]:10 -> [[@LINE+1]]:12 = #1
5858
if (0) {}
5959

60-
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:7 -> [[@LINE+2]]:11 = #0
60+
// CHECK-NEXT: Expansion,File 0, [[@LINE+3]]:7 -> [[@LINE+3]]:11 = #0
61+
// CHECK-NEXT: Gap,File 0, [[@LINE+2]]:15 -> [[@LINE+2]]:16 = #2
6162
// CHECK-NEXT: File 0, [[@LINE+1]]:16 -> [[@LINE+1]]:18 = #2
6263
if (EXPR(i)) {}
6364
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:9 -> [[@LINE+2]]:14 = (#0 + #3)
@@ -70,7 +71,8 @@ void foo(int i) {
7071
for (ASSIGN(DECL(int, j), 0); LT(j, i); INC(j)) {}
7172
// CHECK-NEXT: Expansion,File 0, [[@LINE+1]]:3 -> [[@LINE+1]]:9 = #0
7273
ASSIGN(DECL(int, k), 0);
73-
// CHECK-NEXT: Expansion,File 0, [[@LINE+3]]:10 -> [[@LINE+3]]:12 = (#0 + #5)
74+
// CHECK-NEXT: Expansion,File 0, [[@LINE+4]]:10 -> [[@LINE+4]]:12 = (#0 + #5)
75+
// CHECK-NEXT: Gap,File 0, [[@LINE+3]]:19 -> [[@LINE+3]]:20 = #5
7476
// CHECK-NEXT: File 0, [[@LINE+2]]:20 -> [[@LINE+2]]:31 = #5
7577
// CHECK-NEXT: Expansion,File 0, [[@LINE+1]]:22 -> [[@LINE+1]]:25 = #5
7678
while (LT(k, i)) { INC(k); }
@@ -82,6 +84,7 @@ void foo(int i) {
8284
// CHECK: File 0, [[@LINE+1]]:42 -> [[@LINE+1]]:44 = #7
8385
for (DECL(int, j) : ARR(int, 1, 2, 3)) {}
8486

87+
// CHECK-NEXT: Gap,File 0, [[@LINE+3]]:12 -> [[@LINE+3]]:14 = #8
8588
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:14 -> [[@LINE+2]]:20 = #0
8689
// CHECK-NEXT: Expansion,File 0, [[@LINE+1]]:23 -> [[@LINE+1]]:29 = #0
8790
(void)(i ? PRIo64 : PRIu64);

‎clang/test/CoverageMapping/macroparams2.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ struct S {
66
int i, j;
77
};
88

9-
// CHECK: File 0, [[@LINE+1]]:12 -> [[@LINE+10]]:2 = #0
9+
// CHECK: File 0, [[@LINE+1]]:12 -> [[@LINE+11]]:2 = #0
1010
int main() {
1111
struct S arr[32] = { 0 };
1212
int n = 0;
13-
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:7 -> [[@LINE+2]]:12 = #0
13+
// CHECK-NEXT: Expansion,File 0, [[@LINE+3]]:7 -> [[@LINE+3]]:12 = #0
14+
// CHECK-NEXT: Gap,File 0, [[@LINE+2]]:33 -> [[@LINE+2]]:34 = #1
1415
// CHECK-NEXT: File 0, [[@LINE+1]]:34 -> [[@LINE+3]]:4 = #1
1516
if (MACRO(arr[n].j, arr[n].i)) {
1617
n = 1;

‎clang/test/CoverageMapping/macros.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,32 @@ void func3() { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+3]]:2 = #0
3838
// CHECK-NEXT: File 2, 4:17 -> 4:22 = #0
3939

4040
// CHECK-NEXT: func4
41-
void func4() { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+6]]:2 = #0
41+
void func4() { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+7]]:2 = #0
4242
int i = 0;
4343
while (i++ < 10) // CHECK-NEXT: File 0, [[@LINE]]:10 -> [[@LINE]]:18 = (#0 + #1)
44-
if (i < 5) // CHECK: File 0, [[@LINE]]:5 -> [[@LINE+2]]:14 = #1
44+
if (i < 5) // CHECK: File 0, [[@LINE]]:5 -> [[@LINE+3]]:14 = #1
4545
// CHECK-NEXT: File 0, [[@LINE-1]]:9 -> [[@LINE-1]]:14 = #1
46+
// CHECK-NEXT: Gap,File 0, [[@LINE-2]]:15 -> [[@LINE+1]]:7 = #2
4647
MACRO_2; // CHECK-NEXT: Expansion,File 0, [[@LINE]]:7 -> [[@LINE]]:14 = #2
4748
}
4849
// CHECK-NEXT: File 1, 4:17 -> 4:22 = #2
4950
// CHECK-NOT: File 1
5051

5152
// CHECK-NEXT: func5
52-
void func5() { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+4]]:2 = #0
53+
void func5() { // CHECK-NEXT: File 0, [[@LINE]]:14 -> [[@LINE+5]]:2 = #0
5354
int i = 0;
5455
if (i > 5) // CHECK-NEXT: File 0, [[@LINE]]:7 -> [[@LINE]]:12 = #0
56+
// CHECK-NEXT: Gap,File 0, [[@LINE-1]]:13 -> [[@LINE+1]]:5 = #1
5557
MACRO_3; // CHECK-NEXT: Expansion,File 0, [[@LINE]]:5 -> [[@LINE]]:12 = #1
5658
}
5759
// CHECK-NEXT: Expansion,File 1, 6:17 -> 6:24 = #1
5860
// CHECK-NEXT: File 2, 4:17 -> 4:22 = #1
5961

6062
// CHECK-NEXT: func6
61-
void func6(unsigned count) { // CHECK-NEXT: File 0, [[@LINE]]:28 -> [[@LINE+4]]:2 = #0
62-
begin: // CHECK-NEXT: File 0, [[@LINE]]:1 -> [[@LINE+3]]:2 = #1
63+
void func6(unsigned count) { // CHECK-NEXT: File 0, [[@LINE]]:28 -> [[@LINE+5]]:2 = #0
64+
begin: // CHECK-NEXT: File 0, [[@LINE]]:1 -> [[@LINE+4]]:2 = #1
6365
if (count--) // CHECK-NEXT: File 0, [[@LINE]]:9 -> [[@LINE]]:16 = #1
66+
// CHECK-NEXT: Gap,File 0, [[@LINE-1]]:17 -> [[@LINE+1]]:9 = #2
6467
GOTO begin; // CHECK-NEXT: File 0, [[@LINE]]:9 -> [[@LINE]]:19 = #2
6568
}
6669
// CHECK-NEXT: Expansion,File 0, [[@LINE-2]]:9 -> [[@LINE-2]]:13 = #2

‎clang/test/CoverageMapping/macroscopes.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,15 @@ int main() {
6161
starts_a_scope
6262
ends_a_scope
6363

64-
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:3 -> [[@LINE+2]]:17 = #0
64+
// CHECK-NEXT: Expansion,File 0, [[@LINE+3]]:3 -> [[@LINE+3]]:17 = #0
65+
// CHECK-NEXT: Gap,File 0, [[@LINE+2]]:3 -> [[@LINE+3]]:5 = #8
6566
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:5 -> [[@LINE+2]]:16 = #8
6667
starts_a_while
6768
simple_stmt;
6869

6970
x = 0;
70-
// CHECK-NEXT: Expansion,File 0, [[@LINE+4]]:3 -> [[@LINE+4]]:17 = #0
71+
// CHECK-NEXT: Expansion,File 0, [[@LINE+5]]:3 -> [[@LINE+5]]:17 = #0
72+
// CHECK-NEXT: Gap,File 0, [[@LINE+4]]:3 -> [[@LINE+4]]:18 = #9
7173
// CHECK-NEXT: File 0, [[@LINE+3]]:18 -> [[@LINE+5]]:15 = #9
7274
// CHECK-NEXT: Expansion,File 0, [[@LINE+3]]:5 -> [[@LINE+3]]:16 = #9
7375
// CHECK-NEXT: Expansion,File 0, [[@LINE+3]]:3 -> [[@LINE+3]]:15 = #9

‎clang/test/CoverageMapping/moremacros.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ int main(int argc, const char *argv[]) {
99
// CHECK-NEXT: File 0, [[@LINE+1]]:7 -> [[@LINE+1]]:12 = #0
1010
if (!argc) {} // CHECK: File 0, [[@LINE]]:14 -> [[@LINE]]:16 = #1
1111

12-
// CHECK-NEXT: File 0, [[@LINE+3]]:7 -> [[@LINE+3]]:12 = #0
12+
// CHECK-NEXT: File 0, [[@LINE+4]]:7 -> [[@LINE+4]]:12 = #0
13+
// CHECK-NEXT: Gap,File 0, [[@LINE+3]]:13 -> [[@LINE+3]]:14 = #2
1314
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:14 -> [[@LINE+2]]:19 = #2
1415
// CHECK-NEXT: File 0, [[@LINE+1]]:19 -> [[@LINE+4]]:8 = #2
1516
if (!argc) LBRAC
1617
return 0;
1718
// CHECK-NEXT: Expansion,File 0, [[@LINE+1]]:3 -> [[@LINE+1]]:8 = #2
18-
RBRAC // CHECK-NEXT: [[@LINE]]:8 -> [[@LINE+6]]:3 = (#0 - #2)
19+
RBRAC // CHECK-NEXT: [[@LINE]]:8 -> [[@LINE+7]]:3 = (#0 - #2)
1920

20-
// CHECK-NEXT: File 0, [[@LINE+4]]:3 -> [[@LINE+15]]:2 = (#0 - #2)
21-
// CHECK-NEXT: File 0, [[@LINE+3]]:7 -> [[@LINE+3]]:12 = (#0 - #2)
21+
// CHECK-NEXT: File 0, [[@LINE+5]]:3 -> [[@LINE+16]]:2 = (#0 - #2)
22+
// CHECK-NEXT: File 0, [[@LINE+4]]:7 -> [[@LINE+4]]:12 = (#0 - #2)
23+
// CHECK-NEXT: Gap,File 0, [[@LINE+3]]:13 -> [[@LINE+3]]:14 = #3
2224
// CHECK-NEXT: Expansion,File 0, [[@LINE+2]]:14 -> [[@LINE+2]]:19 = #3
2325
// CHECK-NEXT: File 0, [[@LINE+1]]:19 -> [[@LINE+3]]:4 = #3
2426
if (!argc) LBRAC

0 commit comments

Comments
 (0)