zequanwu updated this revision to Diff 279329.
zequanwu added a comment.
Herald added a project: Sanitizers.
Herald added a subscriber: Sanitizers.
Rebase and address comments.
- Keep track of token locations before and after comment regions by `onToken`
in `Preprocessor` so when emitting `SkippedRegion` we can determine if the
region should be emitted or not.
- Add an end-to-end llvm-cov test case.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D83592/new/
https://reviews.llvm.org/D83592
Files:
clang/include/clang/Lex/Preprocessor.h
clang/lib/CodeGen/CodeGenAction.cpp
clang/lib/CodeGen/CoverageMappingGen.cpp
clang/lib/CodeGen/CoverageMappingGen.h
clang/lib/Lex/Preprocessor.cpp
clang/test/CoverageMapping/break.c
clang/test/CoverageMapping/builtinmacro.c
clang/test/CoverageMapping/classtemplate.cpp
clang/test/CoverageMapping/comment-in-macro.c
clang/test/CoverageMapping/continue.c
clang/test/CoverageMapping/coroutine.cpp
clang/test/CoverageMapping/deferred-region.cpp
clang/test/CoverageMapping/if.cpp
clang/test/CoverageMapping/includehell.cpp
clang/test/CoverageMapping/label.cpp
clang/test/CoverageMapping/logical.cpp
clang/test/CoverageMapping/loops.cpp
clang/test/CoverageMapping/macro-expressions.cpp
clang/test/CoverageMapping/macroparams2.c
clang/test/CoverageMapping/macros.c
clang/test/CoverageMapping/macroscopes.cpp
clang/test/CoverageMapping/moremacros.c
clang/test/CoverageMapping/objc.m
clang/test/CoverageMapping/pr32679.cpp
clang/test/CoverageMapping/preprocessor.c
clang/test/CoverageMapping/return.c
clang/test/CoverageMapping/switch.cpp
clang/test/CoverageMapping/switchmacro.c
clang/test/CoverageMapping/test.c
clang/test/CoverageMapping/trycatch.cpp
clang/test/CoverageMapping/unreachable-macro.c
clang/test/CoverageMapping/while.c
clang/test/lit.cfg.py
compiler-rt/test/profile/Inputs/instrprof-comdat.h
compiler-rt/test/profile/Linux/coverage_comments.cpp
Index: compiler-rt/test/profile/Linux/coverage_comments.cpp
===================================================================
--- /dev/null
+++ compiler-rt/test/profile/Linux/coverage_comments.cpp
@@ -0,0 +1,77 @@
+// RUN: %clangxx_profgen -std=c++11 -fuse-ld=gold -fcoverage-mapping -Wno-comment -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 -path-equivalence=/tmp,%S 2>&1 | FileCheck %s
+
+int main() { // CHECK: [[@LINE]]| 1|int main() {
+ /* comment */ int x = 0; // CHECK: [[@LINE]]| 1| /* comment */ int x = 0;
+ int y = 0; /* comment */ // CHECK: [[@LINE]]| 1| int y = 0; /* comment */
+ int z = 0; // comment // CHECK: [[@LINE]]| 1| int z = 0; // comment
+ // comment // CHECK: [[@LINE]]| | // comment
+ // CHECK: [[@LINE]]| |
+ x = 0; /* // CHECK: [[@LINE]]| 1| x = 0; /*
+ comment // CHECK: [[@LINE]]| | comment
+ */
+ // CHECK: [[@LINE]]| | */
+ // CHECK: [[@LINE]]| |
+ /* // CHECK: [[@LINE]]| | /*
+ comment // CHECK: [[@LINE]]| | comment
+ */
+ x = 0; // CHECK: [[@LINE]]| 1| */ x = 0;
+ // CHECK: [[@LINE]]| |
+ /* comment */ // CHECK: [[@LINE]]| | /* comment */
+ // comment // CHECK: [[@LINE]]| | // comment
+ /* comment */ // CHECK: [[@LINE]]| | /* comment */
+ z = // CHECK: [[@LINE]]| 1| z =
+ x // comment // CHECK: [[@LINE]]| 1| x // comment
+ // comment // CHECK: [[@LINE]]| | // comment
+ + /* // CHECK: [[@LINE]]| 1| + /*
+ comment // CHECK: [[@LINE]]| | comment
+ */
+ // CHECK: [[@LINE]]| | */
+ /* // CHECK: [[@LINE]]| | /*
+ comment // CHECK: [[@LINE]]| | comment
+ */
+ y; // CHECK: [[@LINE]]| 1| */y;
+ // CHECK: [[@LINE]]| |
+// Comments inside directives. // CHECK: [[@LINE]]| | // Comments inside directives.
+#if 0 //comment // CHECK: [[@LINE]]| | #if 0 //comment
+ /* comment */ x = 0; // CHECK: [[@LINE]]| | /* comment */ x = 0;
+ y = 0; /* comment */ // CHECK: [[@LINE]]| | y = 0; /* comment */
+ z = 0; // comment // CHECK: [[@LINE]]| | z = 0; // comment
+ // comment // CHECK: [[@LINE]]| | // comment
+ // CHECK: [[@LINE]]| |
+ x = 0; /* // CHECK: [[@LINE]]| | x = 0; /*
+ comment // CHECK: [[@LINE]]| | comment
+ */ // CHECK: [[@LINE]]| | */
+ // CHECK: [[@LINE]]| |
+ /* // CHECK: [[@LINE]]| | /*
+ comment // CHECK: [[@LINE]]| | comment
+ */ x = 0; // CHECK: [[@LINE]]| | */ x = 0;
+ // CHECK: [[@LINE]]| |
+ /* comment */ // CHECK: [[@LINE]]| | /* comment */
+ // comment // CHECK: [[@LINE]]| | // comment
+ /* comment */ // CHECK: [[@LINE]]| | /* comment */
+#endif // comment // CHECK: [[@LINE]]| | #endif // comment
+#if 1 // comment // CHECK: [[@LINE]]| 1| #if 1 // comment
+ /* comment */ x = 0; // CHECK: [[@LINE]]| 1| /* comment */ x = 0;
+ y = 0; /* comment */ // CHECK: [[@LINE]]| 1| y = 0; /* comment */
+ z = 0; // comment // CHECK: [[@LINE]]| 1| z = 0; // comment
+ // comment // CHECK: [[@LINE]]| | // comment
+ // CHECK: [[@LINE]]| |
+ x = 0; /* // CHECK: [[@LINE]]| 1| x = 0; /*
+ comment // CHECK: [[@LINE]]| | comment
+ */
+ // CHECK: [[@LINE]]| | */
+ // CHECK: [[@LINE]]| |
+ /* // CHECK: [[@LINE]]| | /*
+ comment // CHECK: [[@LINE]]| | comment
+ */
+ x = 0; // CHECK: [[@LINE]]| 1| */ x = 0;
+ // CHECK: [[@LINE]]| |
+/* comment */ // CHECK: [[@LINE]]| | /* comment */
+// comment // CHECK: [[@LINE]]| | // comment
+/* comment */ // CHECK: [[@LINE]]| | /* comment */
+#endif //comment // CHECK: [[@LINE]]| 1| #endif //comment
+ return 0; // CHECK: [[@LINE]]| 1| return 0;
+} // CHECK: [[@LINE]]| 1|}
\ No newline at end of file
Index: compiler-rt/test/profile/Inputs/instrprof-comdat.h
===================================================================
--- compiler-rt/test/profile/Inputs/instrprof-comdat.h
+++ compiler-rt/test/profile/Inputs/instrprof-comdat.h
@@ -18,6 +18,6 @@
if (I > ti / 2) // HEADER: [[@LINE]]| 20| if (I > ti
t -= 1; // HEADER: [[@LINE]]| 8| t -= 1;
} // HEADER: [[@LINE]]| 10| }
- // HEADER: [[@LINE]]| 1|
+ // HEADER: [[@LINE]]| |
return t; // HEADER: [[@LINE]]| 1| return t;
}
Index: clang/test/lit.cfg.py
===================================================================
--- clang/test/lit.cfg.py
+++ clang/test/lit.cfg.py
@@ -91,6 +91,11 @@
('%hmaptool', "'%s' %s" % (config.python_executable,
os.path.join(config.clang_tools_dir, 'hmaptool'))))
+# Strip C++ comments "//"" from tests
+config.substitutions.append(
+ ('%strip_comments', "sed 's/[ \t]*\/\/.*//' %s > %T/%basename_t")
+)
+
# Plugins (loadable modules)
if config.has_plugins and config.llvm_plugin_ext:
config.available_features.add('plugins')
Index: clang/test/CoverageMapping/while.c
===================================================================
--- clang/test/CoverageMapping/while.c
+++ clang/test/CoverageMapping/while.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %T/%basename_t | FileCheck %s
- // CHECK: main
+// CHECK: main
int main() { // CHECK-NEXT: File 0, [[@LINE]]:12 -> [[@LINE+8]]:2 = #0
int j = 0; // CHECK-NEXT: File 0, [[@LINE+1]]:9 -> [[@LINE+1]]:14 = (#0 + #1)
while(j < 5) ++j; // CHECK-NEXT: File 0, [[@LINE]]:15 -> [[@LINE]]:16 = #1
Index: clang/test/CoverageMapping/unreachable-macro.c
===================================================================
--- clang/test/CoverageMapping/unreachable-macro.c
+++ clang/test/CoverageMapping/unreachable-macro.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %T/%basename_t | FileCheck %s
#define WHILE while (0) {}
Index: clang/test/CoverageMapping/trycatch.cpp
===================================================================
--- clang/test/CoverageMapping/trycatch.cpp
+++ clang/test/CoverageMapping/trycatch.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions -fcxx-exceptions -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name trycatch.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -triple %itanium_abi_triple -std=c++11 -fexceptions -fcxx-exceptions -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name trycatch.cpp %T/%basename_t | FileCheck %s
class Error {
};
Index: clang/test/CoverageMapping/test.c
===================================================================
--- clang/test/CoverageMapping/test.c
+++ clang/test/CoverageMapping/test.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name test.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name test.c %T/%basename_t | FileCheck %s
void bar();
static void static_func();
Index: clang/test/CoverageMapping/switchmacro.c
===================================================================
--- clang/test/CoverageMapping/switchmacro.c
+++ clang/test/CoverageMapping/switchmacro.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name switchmacro.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name switchmacro.c %T/%basename_t | FileCheck %s
#define FOO(x) (void)x
Index: clang/test/CoverageMapping/switch.cpp
===================================================================
--- clang/test/CoverageMapping/switch.cpp
+++ clang/test/CoverageMapping/switch.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++1z -triple %itanium_abi_triple -main-file-name switch.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++1z -triple %itanium_abi_triple -main-file-name switch.cpp %T/%basename_t | FileCheck %s
- // CHECK: foo
+// CHECK: foo
void foo(int i) { // CHECK-NEXT: File 0, [[@LINE]]:17 -> [[@LINE+8]]:2 = #0
switch(i) { // CHECK-NEXT: Gap,File 0, [[@LINE]]:13 -> [[@LINE+4]]:10 = 0
case 1: // CHECK-NEXT: File 0, [[@LINE]]:3 -> [[@LINE+1]]:11 = #2
Index: clang/test/CoverageMapping/return.c
===================================================================
--- clang/test/CoverageMapping/return.c
+++ clang/test/CoverageMapping/return.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name return.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name return.c %T/%basename_t | FileCheck %s
- // CHECK: func
+// CHECK: func
void func() { // CHECK: File 0, [[@LINE]]:13 -> [[@LINE+3]]:2 = #0
return;
int i = 0; // CHECK-NEXT: File 0, [[@LINE]]:3 -> [[@LINE+1]]:2 = 0
Index: clang/test/CoverageMapping/preprocessor.c
===================================================================
--- clang/test/CoverageMapping/preprocessor.c
+++ clang/test/CoverageMapping/preprocessor.c
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name preprocessor.c %s | FileCheck %s
+// RUN: %strip_comments > %T/%basename_t && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name preprocessor.c %T/%basename_t | FileCheck %s
- // CHECK: func
+// CHECK: func
void func() { // CHECK: File 0, [[@LINE]]:13 -> [[@LINE+5]]:2 = #0
int i = 0;
#ifdef MACRO // CHECK-NEXT: Skipped,File 0, [[@LINE]]:1 -> [[@LINE+2]]:7 = 0
@@ -11,7 +11,7 @@
// CHECK: main
int main() { // CHECK-NEXT: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 = #0
int i = 0;
-# if 0 // CHECK-NEXT: Skipped,File 0, [[@LINE]]:1 -> [[@LINE+4]]:29 = 0
+#if 0 // CHECK-NEXT: Skipped,File 0, [[@LINE]]:1 -> [[@LINE+4]]:9 = 0
if(i == 0) {
i = 1;
}
@@ -29,7 +29,7 @@
}
#endif
- // CHECK-NEXT: Skipped,File 0, [[@LINE+1]]:1 -> [[@LINE+4]]:24
+ // CHECK-NEXT: Skipped,File 0, [[@LINE+1]]:1 -> [[@LINE+4]]:8
#\
if 0
#\
@@ -59,7 +59,7 @@
#\
endif
- // CHECK-NEXT: Skipped,File 0, [[@LINE+1]]:1 -> [[@LINE+6]]:26
+ // CHECK-NEXT: Skipped,File 0, [[@LINE+1]]:1 -> [[@LINE+6]]:10
#\
ifdef NOT_DEFINED
#\
Index: clang/test/CoverageMapping/pr32679.cpp
===================================================================
--- clang/test/CoverageMapping/pr32679.cpp
+++ clang/test/CoverageMapping/pr32679.cpp
@@ -1,5 +1,6 @@
-// RUN: %clang_cc1 -cc1 -triple i686-pc-windows-msvc19.0.0 -emit-obj -fprofile-instrument=clang -std=c++14 -fdelayed-template-parsing -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name pr32679.cpp -o - %s | FileCheck %s -check-prefix=MSABI -implicit-check-not=f2
-// RUN: %clang_cc1 -cc1 -triple %itanium_abi_triple -emit-obj -fprofile-instrument=clang -std=c++14 -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name pr32679.cpp -o - %s | FileCheck %s -check-prefix=ITANIUM -implicit-check-not=f2
+// RUN: %strip_comments
+// RUN: %clang_cc1 -cc1 -triple i686-pc-windows-msvc19.0.0 -emit-obj -fprofile-instrument=clang -std=c++14 -fdelayed-template-parsing -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name pr32679.cpp -o - %T/%basename_t | FileCheck %s -check-prefix=MSABI -implicit-check-not=f2
+// RUN: %clang_cc1 -cc1 -triple %itanium_abi_triple -emit-obj -fprofile-instrument=clang -std=c++14 -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name pr32679.cpp -o - %T/%basename_t | FileCheck %s -check-prefix=ITANIUM -implicit-check-not=f2
template <typename T, int S1>
struct CreateSpecialization;
Index: clang/test/CoverageMapping/objc.m
===================================================================
--- clang/test/CoverageMapping/objc.m
+++ clang/test/CoverageMapping/objc.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name objc.m -triple x86_64-apple-darwin -fobjc-runtime=macosx-fragile-10.5 -w %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name objc.m -triple x86_64-apple-darwin -fobjc-runtime=macosx-fragile-10.5 -w %T/%basename_t | FileCheck %s
@interface A
- (void)bork:(int)msg;
Index: clang/test/CoverageMapping/moremacros.c
===================================================================
--- clang/test/CoverageMapping/moremacros.c
+++ clang/test/CoverageMapping/moremacros.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macro-expansion.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macro-expansion.c %T/%basename_t | FileCheck %s
#define LBRAC {
#define RBRAC }
Index: clang/test/CoverageMapping/macroscopes.cpp
===================================================================
--- clang/test/CoverageMapping/macroscopes.cpp
+++ clang/test/CoverageMapping/macroscopes.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macroscopes.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macroscopes.cpp %T/%basename_t | FileCheck %s
#define starts_a_scope for (int i = 0; i < 2; ++i) {
Index: clang/test/CoverageMapping/macros.c
===================================================================
--- clang/test/CoverageMapping/macros.c
+++ clang/test/CoverageMapping/macros.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macros.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macros.c %T/%basename_t | FileCheck %s
#define MACRO return; bar()
#define MACRO_2 bar()
Index: clang/test/CoverageMapping/macroparams2.c
===================================================================
--- clang/test/CoverageMapping/macroparams2.c
+++ clang/test/CoverageMapping/macroparams2.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macroparams2.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macroparams2.c %T/%basename_t | FileCheck %s
#define MACRO(REFS, CALLS) (4 * (CALLS) < (REFS))
Index: clang/test/CoverageMapping/macro-expressions.cpp
===================================================================
--- clang/test/CoverageMapping/macro-expressions.cpp
+++ clang/test/CoverageMapping/macro-expressions.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macro-expressions.cpp -w %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name macro-expressions.cpp -w %T/%basename_t | FileCheck %s
#define EXPR(x) (x)
#define NEXPR(x) (!x)
Index: clang/test/CoverageMapping/loops.cpp
===================================================================
--- clang/test/CoverageMapping/loops.cpp
+++ clang/test/CoverageMapping/loops.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name loops.cpp %T/%basename_t| FileCheck %s
- // CHECK: rangedFor
+// CHECK: rangedFor
void rangedFor() { // CHECK-NEXT: File 0, [[@LINE]]:18 -> {{[0-9]+}}:2 = #0
int arr[] = { 1, 2, 3, 4, 5 };
int sum = 0; // CHECK: Gap,File 0, [[@LINE+1]]:20 -> [[@LINE+1]]:21 = #1
Index: clang/test/CoverageMapping/logical.cpp
===================================================================
--- clang/test/CoverageMapping/logical.cpp
+++ clang/test/CoverageMapping/logical.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name logical.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name logical.cpp %T/%basename_t| FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 -> [[@LINE+15]]:2 = #0
bool bt = true;
Index: clang/test/CoverageMapping/label.cpp
===================================================================
--- clang/test/CoverageMapping/label.cpp
+++ clang/test/CoverageMapping/label.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name label.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name label.cpp %T/%basename_t | FileCheck %s
- // CHECK: func
+// CHECK: func
void func() { // CHECK-NEXT: File 0, [[@LINE]]:13 -> {{[0-9]+}}:2 = #0
int i = 0; // CHECK-NEXT: File 0, [[@LINE+2]]:14 -> [[@LINE+2]]:20 = (#0 + #3)
// CHECK-NEXT: File 0, [[@LINE+1]]:22 -> [[@LINE+1]]:25 = #3
Index: clang/test/CoverageMapping/includehell.cpp
===================================================================
--- clang/test/CoverageMapping/includehell.cpp
+++ clang/test/CoverageMapping/includehell.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name includehell.cpp %s > %tmapping
+// RUN: %strip_comments && %clang_cc1 -I/%S -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name includehell.cpp %T/%basename_t > %tmapping
int main() {
int x = 0;
@@ -51,6 +51,7 @@
// CHECK-START: File [[START3]], 4:29 -> 5:1 = #9
// CHECK-CODE: File [[CODE1:[0-9]]], 1:1 -> 14:1 = #1
+// CHECK-CODE: Skipped,File [[CODE1]], 1:1 -> 1:41 = 0
// CHECK-CODE-NEXT: File [[CODE1]], 4:5 -> 4:11 = #1
// CHECK-CODE: File [[CODE1]], 4:13 -> 6:2 = #2
// CHECK-CODE: File [[CODE1]], 6:8 -> 8:2 = (#1 - #2)
@@ -58,6 +59,7 @@
// CHECK-CODE: File [[CODE1]], 9:11 -> 11:2 = #3
// CHECK-CODE: File [[CODE1]], 11:8 -> 13:2 = (#1 - #3)
// CHECK-CODE: File [[CODE2:[0-9]]], 1:1 -> 14:1 = #5
+// CHECK-CODE: Skipped,File [[CODE2]], 1:1 -> 1:41 = 0
// CHECK-CODE-NEXT: File [[CODE2]], 4:5 -> 4:11 = #5
// CHECK-CODE: File [[CODE2]], 4:13 -> 6:2 = #6
// CHECK-CODE: File [[CODE2]], 6:8 -> 8:2 = (#5 - #6)
Index: clang/test/CoverageMapping/if.cpp
===================================================================
--- clang/test/CoverageMapping/if.cpp
+++ clang/test/CoverageMapping/if.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++1z -triple %itanium_abi_triple -main-file-name if.cpp %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -std=c++1z -triple %itanium_abi_triple -main-file-name if.cpp %T/%basename_t | FileCheck %s
int nop() { return 0; }
Index: clang/test/CoverageMapping/deferred-region.cpp
===================================================================
--- clang/test/CoverageMapping/deferred-region.cpp
+++ clang/test/CoverageMapping/deferred-region.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -fexceptions -fcxx-exceptions -emit-llvm-only -triple %itanium_abi_triple -main-file-name deferred-region.cpp -I %S/Inputs %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -std=c++11 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -fexceptions -fcxx-exceptions -emit-llvm-only -triple %itanium_abi_triple -main-file-name deferred-region.cpp -I %S/Inputs %T/%basename_t | FileCheck %s
#define IF if
#define STMT(S) S
Index: clang/test/CoverageMapping/coroutine.cpp
===================================================================
--- clang/test/CoverageMapping/coroutine.cpp
+++ clang/test/CoverageMapping/coroutine.cpp
@@ -1,6 +1,6 @@
// fixme: the following line is added to cleanup bots, will be removed in weeks.
// RUN: rm -f %S/coroutine.ll
-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcoroutines-ts -std=c++14 -emit-llvm -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping %s -o - | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -triple x86_64-unknown-linux-gnu -fcoroutines-ts -std=c++14 -emit-llvm -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping %T/%basename_t -o - | FileCheck %s
namespace std::experimental {
template <typename... T>
Index: clang/test/CoverageMapping/continue.c
===================================================================
--- clang/test/CoverageMapping/continue.c
+++ clang/test/CoverageMapping/continue.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name continue.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name continue.c %T/%basename_t | FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 -> [[@LINE+21]]:2 = #0
int j = 0; // CHECK-NEXT: File 0, [[@LINE+2]]:18 -> [[@LINE+2]]:24 = (#0 + #1)
Index: clang/test/CoverageMapping/comment-in-macro.c
===================================================================
--- clang/test/CoverageMapping/comment-in-macro.c
+++ clang/test/CoverageMapping/comment-in-macro.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %T/%basename_t | FileCheck %s
#define x1 "" // ...
#define x2 return 0
Index: clang/test/CoverageMapping/classtemplate.cpp
===================================================================
--- clang/test/CoverageMapping/classtemplate.cpp
+++ clang/test/CoverageMapping/classtemplate.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple %itanium_abi_triple -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name classtemplate.cpp %s > %tmapping
+// RUN: %strip_comments && %clang_cc1 -triple %itanium_abi_triple -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name classtemplate.cpp %T/%basename_t > %tmapping
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-CONSTRUCTOR
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-GETTER
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-SETTER
Index: clang/test/CoverageMapping/builtinmacro.c
===================================================================
--- clang/test/CoverageMapping/builtinmacro.c
+++ clang/test/CoverageMapping/builtinmacro.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name builtinmacro.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name builtinmacro.c %T/%basename_t | FileCheck %s
// Test the coverage mapping generation for built-in macroes.
Index: clang/test/CoverageMapping/break.c
===================================================================
--- clang/test/CoverageMapping/break.c
+++ clang/test/CoverageMapping/break.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name break.c %s | FileCheck %s
+// RUN: %strip_comments && %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name break.c %T/%basename_t | FileCheck %s
int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 = #0
int cnt = 0; // CHECK-NEXT: File 0, [[@LINE+1]]:9 -> [[@LINE+1]]:18 = #0
Index: clang/lib/Lex/Preprocessor.cpp
===================================================================
--- clang/lib/Lex/Preprocessor.cpp
+++ clang/lib/Lex/Preprocessor.cpp
@@ -969,7 +969,8 @@
LastTokenWasAt = Result.is(tok::at);
--LexLevel;
- if (LexLevel == 0 && !Result.getFlag(Token::IsReinjected)) {
+ if ((LexLevel == 0 || PreprocessToken) &&
+ !Result.getFlag(Token::IsReinjected)) {
++TokenCount;
if (OnToken)
OnToken(Result);
Index: clang/lib/CodeGen/CoverageMappingGen.h
===================================================================
--- clang/lib/CodeGen/CoverageMappingGen.h
+++ clang/lib/CodeGen/CoverageMappingGen.h
@@ -16,7 +16,9 @@
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Lex/PPCallbacks.h"
+#include "clang/Lex/Preprocessor.h"
#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/MapVector.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/Support/raw_ostream.h"
@@ -32,12 +34,24 @@
/// Stores additional source code information like skipped ranges which
/// is required by the coverage mapping generator and is obtained from
/// the preprocessor.
-class CoverageSourceInfo : public PPCallbacks {
- std::vector<SourceRange> SkippedRanges;
+class CoverageSourceInfo : public PPCallbacks, public CommentHandler {
+ // A pair of SkippedRanges and PrevTokLoc with NextTokLoc
+ std::vector<std::pair<SourceRange, SourceRange>> SkippedRanges;
+ int LastCommentIndex = -1;
+
public:
- ArrayRef<SourceRange> getSkippedRanges() const { return SkippedRanges; }
+ SourceLocation PrevTokLoc;
+ SourceLocation BeforeCommentLoc;
+
+ std::vector<std::pair<SourceRange, SourceRange>> &getSkippedRanges() {
+ return SkippedRanges;
+ }
void SourceRangeSkipped(SourceRange Range, SourceLocation EndifLoc) override;
+
+ bool HandleComment(Preprocessor &PP, SourceRange Range) override;
+
+ void updateNextTokLoc(SourceLocation Loc);
};
namespace CodeGen {
@@ -66,6 +80,8 @@
uint64_t FilenamesRef);
public:
+ static CoverageSourceInfo *setUpCoverageCallbacks(Preprocessor &PP);
+
CoverageMappingModuleGen(CodeGenModule &CGM, CoverageSourceInfo &SourceInfo)
: CGM(CGM), SourceInfo(SourceInfo) {}
Index: clang/lib/CodeGen/CoverageMappingGen.cpp
===================================================================
--- clang/lib/CodeGen/CoverageMappingGen.cpp
+++ clang/lib/CodeGen/CoverageMappingGen.cpp
@@ -35,8 +35,40 @@
using namespace CodeGen;
using namespace llvm::coverage;
+CoverageSourceInfo *
+CoverageMappingModuleGen::setUpCoverageCallbacks(Preprocessor &PP) {
+ CoverageSourceInfo *CoverageInfo = new CoverageSourceInfo;
+ PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(CoverageInfo));
+ PP.addCommentHandler(CoverageInfo);
+ PP.setPreprocessToken(true);
+ PP.setTokenWatcher([CoverageInfo](clang::Token Tok) {
+ // Record previous token location.
+ CoverageInfo->PrevTokLoc = Tok.getLocation();
+ CoverageInfo->updateNextTokLoc(Tok.getLocation());
+ });
+ return CoverageInfo;
+}
+
void CoverageSourceInfo::SourceRangeSkipped(SourceRange Range, SourceLocation) {
- SkippedRanges.push_back(Range);
+ SkippedRanges.push_back(std::make_pair(Range, SourceRange()));
+}
+
+bool CoverageSourceInfo::HandleComment(Preprocessor &PP, SourceRange Range) {
+ if (PrevTokLoc.isValid() && PrevTokLoc == BeforeCommentLoc)
+ SkippedRanges.back().first.setEnd(Range.getEnd());
+ else {
+ SkippedRanges.push_back(std::make_pair(Range, SourceRange(PrevTokLoc)));
+ BeforeCommentLoc = PrevTokLoc;
+ }
+ LastCommentIndex = SkippedRanges.size() - 1;
+ return false;
+}
+
+void CoverageSourceInfo::updateNextTokLoc(SourceLocation Loc) {
+ if (LastCommentIndex != -1) {
+ SkippedRanges[LastCommentIndex].second.setEnd(Loc);
+ LastCommentIndex = -1;
+ }
}
namespace {
@@ -274,8 +306,27 @@
return None;
}
+ /// Return true if SR should be emitted as SkippedRange.
+ bool updateSkippedRange(SourceManager &SM, SpellingRegion &SR,
+ SourceRange Range) {
+ // If Range begin location is invalid, it's not a comment region.
+ if (Range.getBegin().isInvalid())
+ return true;
+ unsigned PrevLine = SM.getSpellingLineNumber(Range.getBegin());
+ unsigned NextLine = SM.getSpellingLineNumber(Range.getEnd());
+ if (SR.LineStart == PrevLine) {
+ SR.LineStart++;
+ SR.ColumnStart = 1;
+ }
+ if (SR.LineEnd == NextLine) {
+ SR.LineEnd--;
+ SR.ColumnEnd = 1;
+ }
+ return SR.isInSourceOrder();
+ }
+
/// Gather all the regions that were skipped by the preprocessor
- /// using the constructs like #if.
+ /// using the constructs like #if or comments.
void gatherSkippedRegions() {
/// An array of the minimum lineStarts and the maximum lineEnds
/// for mapping regions from the appropriate source files.
@@ -291,9 +342,10 @@
}
auto SkippedRanges = CVM.getSourceInfo().getSkippedRanges();
- for (const auto &I : SkippedRanges) {
- auto LocStart = I.getBegin();
- auto LocEnd = I.getEnd();
+ for (auto &I : SkippedRanges) {
+ SourceRange Range = I.first;
+ auto LocStart = Range.getBegin();
+ auto LocEnd = Range.getEnd();
assert(SM.isWrittenInSameFile(LocStart, LocEnd) &&
"region spans multiple files");
@@ -301,6 +353,8 @@
if (!CovFileID)
continue;
SpellingRegion SR{SM, LocStart, LocEnd};
+ if (!updateSkippedRange(SM, SR, I.second))
+ continue;
auto Region = CounterMappingRegion::makeSkipped(
*CovFileID, SR.LineStart, SR.ColumnStart, SR.LineEnd, SR.ColumnEnd);
// Make sure that we only collect the regions that are inside
Index: clang/lib/CodeGen/CodeGenAction.cpp
===================================================================
--- clang/lib/CodeGen/CodeGenAction.cpp
+++ clang/lib/CodeGen/CodeGenAction.cpp
@@ -990,11 +990,9 @@
CoverageSourceInfo *CoverageInfo = nullptr;
// Add the preprocessor callback only when the coverage mapping is generated.
- if (CI.getCodeGenOpts().CoverageMapping) {
- CoverageInfo = new CoverageSourceInfo;
- CI.getPreprocessor().addPPCallbacks(
- std::unique_ptr<PPCallbacks>(CoverageInfo));
- }
+ if (CI.getCodeGenOpts().CoverageMapping)
+ CoverageInfo = CodeGen::CoverageMappingModuleGen::setUpCoverageCallbacks(
+ CI.getPreprocessor());
std::unique_ptr<BackendConsumer> Result(new BackendConsumer(
BA, CI.getDiagnostics(), CI.getHeaderSearchOpts(),
Index: clang/include/clang/Lex/Preprocessor.h
===================================================================
--- clang/include/clang/Lex/Preprocessor.h
+++ clang/include/clang/Lex/Preprocessor.h
@@ -419,6 +419,9 @@
/// The number of (LexLevel 0) preprocessor tokens.
unsigned TokenCount = 0;
+ /// Preprocess every token regardless of LexLevel.
+ bool PreprocessToken = false;
+
/// The maximum number of (LexLevel 0) tokens before issuing a -Wmax-tokens
/// warning, or zero for unlimited.
unsigned MaxTokens = 0;
@@ -1038,6 +1041,8 @@
OnToken = std::move(F);
}
+ void setPreprocessToken(bool Preprocess) { PreprocessToken = Preprocess; }
+
bool isMacroDefined(StringRef Id) {
return isMacroDefined(&Identifiers.get(Id));
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
