Skip to content

Commit 9caa3fb

Browse files
ZequanWuZequanWu
committed
[Coverage] Add empty line regions to SkippedRegions
Differential Revision: https://reviews.llvm.org/D84988
1 parent 6bad3ca commit 9caa3fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+247
-135
lines changed

‎clang/include/clang/Lex/Lexer.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ class Lexer : public PreprocessorLexer {
128128

129129
bool HasLeadingEmptyMacro;
130130

131+
// NewLinePtr - A pointer to new line character '\n' being lexed. For '\r\n',
132+
// it also points to '\n.'
133+
const char *NewLinePtr;
134+
131135
// CurrentConflictMarkerState - The kind of conflict marker we are handling.
132136
ConflictMarkerKind CurrentConflictMarkerState;
133137

‎clang/include/clang/Lex/Preprocessor.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ class CodeCompletionHandler;
6767
class CommentHandler;
6868
class DirectoryEntry;
6969
class DirectoryLookup;
70+
class EmptylineHandler;
7071
class ExternalPreprocessorSource;
7172
class FileEntry;
7273
class FileManager;
@@ -256,6 +257,9 @@ class Preprocessor {
256257
/// with this preprocessor.
257258
std::vector<CommentHandler *> CommentHandlers;
258259

260+
/// Empty line handler.
261+
EmptylineHandler *Emptyline = nullptr;
262+
259263
/// True if we want to ignore EOF token and continue later on (thus
260264
/// avoid tearing the Lexer and etc. down).
261265
bool IncrementalProcessing = false;
@@ -1219,6 +1223,11 @@ class Preprocessor {
12191223
/// Install empty handlers for all pragmas (making them ignored).
12201224
void IgnorePragmas();
12211225

1226+
/// Set empty line handler.
1227+
void setEmptylineHandler(EmptylineHandler *Handler) { Emptyline = Handler; }
1228+
1229+
EmptylineHandler *getEmptylineHandler() const { return Emptyline; }
1230+
12221231
/// Add the specified comment handler to the preprocessor.
12231232
void addCommentHandler(CommentHandler *Handler);
12241233

@@ -2390,6 +2399,16 @@ class CommentHandler {
23902399
virtual bool HandleComment(Preprocessor &PP, SourceRange Comment) = 0;
23912400
};
23922401

2402+
/// Abstract base class that describes a handler that will receive
2403+
/// source ranges for empty lines encountered in the source file.
2404+
class EmptylineHandler {
2405+
public:
2406+
virtual ~EmptylineHandler();
2407+
2408+
// The handler handles empty lines.
2409+
virtual void HandleEmptyline(SourceRange Range) = 0;
2410+
};
2411+
23932412
/// Registry of pragma handlers added by plugins
23942413
using PragmaHandlerRegistry = llvm::Registry<PragmaHandler>;
23952414

‎clang/lib/CodeGen/CoverageMappingGen.cpp

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,40 +31,61 @@
3131
// is textually included.
3232
#define COVMAP_V3
3333

34+
static llvm::cl::opt<bool> EmptyLineCommentCoverage(
35+
"emptyline-comment-coverage",
36+
llvm::cl::desc("Emit emptylines and comment lines as skipped regions (only "
37+
"disable it on test)"),
38+
llvm::cl::init(true), llvm::cl::Hidden);
39+
3440
using namespace clang;
3541
using namespace CodeGen;
3642
using namespace llvm::coverage;
3743

3844
CoverageSourceInfo *
3945
CoverageMappingModuleGen::setUpCoverageCallbacks(Preprocessor &PP) {
40-
CoverageSourceInfo *CoverageInfo = new CoverageSourceInfo();
46+
CoverageSourceInfo *CoverageInfo =
47+
new CoverageSourceInfo(PP.getSourceManager());
4148
PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(CoverageInfo));
42-
PP.addCommentHandler(CoverageInfo);
43-
PP.setPreprocessToken(true);
44-
PP.setTokenWatcher([CoverageInfo](clang::Token Tok) {
45-
// Update previous token location.
46-
CoverageInfo->PrevTokLoc = Tok.getLocation();
47-
if (Tok.getKind() != clang::tok::eod)
48-
CoverageInfo->updateNextTokLoc(Tok.getLocation());
49-
});
49+
if (EmptyLineCommentCoverage) {
50+
PP.addCommentHandler(CoverageInfo);
51+
PP.setEmptylineHandler(CoverageInfo);
52+
PP.setPreprocessToken(true);
53+
PP.setTokenWatcher([CoverageInfo](clang::Token Tok) {
54+
// Update previous token location.
55+
CoverageInfo->PrevTokLoc = Tok.getLocation();
56+
if (Tok.getKind() != clang::tok::eod)
57+
CoverageInfo->updateNextTokLoc(Tok.getLocation());
58+
});
59+
}
5060
return CoverageInfo;
5161
}
5262

63+
void CoverageSourceInfo::AddSkippedRange(SourceRange Range) {
64+
if (EmptyLineCommentCoverage && !SkippedRanges.empty() &&
65+
PrevTokLoc == SkippedRanges.back().PrevTokLoc &&
66+
SourceMgr.isWrittenInSameFile(SkippedRanges.back().Range.getEnd(),
67+
Range.getBegin()))
68+
SkippedRanges.back().Range.setEnd(Range.getEnd());
69+
else
70+
SkippedRanges.push_back({Range, PrevTokLoc});
71+
}
72+
5373
void CoverageSourceInfo::SourceRangeSkipped(SourceRange Range, SourceLocation) {
54-
SkippedRanges.push_back({Range});
74+
AddSkippedRange(Range);
75+
}
76+
77+
void CoverageSourceInfo::HandleEmptyline(SourceRange Range) {
78+
AddSkippedRange(Range);
5579
}
5680

5781
bool CoverageSourceInfo::HandleComment(Preprocessor &PP, SourceRange Range) {
58-
SkippedRanges.push_back({Range, PrevTokLoc});
59-
AfterComment = true;
82+
AddSkippedRange(Range);
6083
return false;
6184
}
6285

6386
void CoverageSourceInfo::updateNextTokLoc(SourceLocation Loc) {
64-
if (AfterComment) {
87+
if (!SkippedRanges.empty() && SkippedRanges.back().NextTokLoc.isInvalid())
6588
SkippedRanges.back().NextTokLoc = Loc;
66-
AfterComment = false;
67-
}
6889
}
6990

7091
namespace {
@@ -311,24 +332,17 @@ class CoverageMappingBuilder {
311332
SourceLocation PrevTokLoc,
312333
SourceLocation NextTokLoc) {
313334
SpellingRegion SR{SM, LocStart, LocEnd};
314-
// If Range begin location is invalid, it's not a comment region.
315-
if (PrevTokLoc.isInvalid())
316-
return SR;
317-
unsigned PrevTokLine = SM.getSpellingLineNumber(PrevTokLoc);
318-
unsigned NextTokLine = SM.getSpellingLineNumber(NextTokLoc);
319-
SpellingRegion newSR(SR);
320-
if (SM.isWrittenInSameFile(LocStart, PrevTokLoc) &&
321-
SR.LineStart == PrevTokLine) {
322-
newSR.LineStart = SR.LineStart + 1;
323-
newSR.ColumnStart = 1;
335+
SR.ColumnStart = 1;
336+
if (PrevTokLoc.isValid() && SM.isWrittenInSameFile(LocStart, PrevTokLoc) &&
337+
SR.LineStart == SM.getSpellingLineNumber(PrevTokLoc))
338+
SR.LineStart++;
339+
if (NextTokLoc.isValid() && SM.isWrittenInSameFile(LocEnd, NextTokLoc) &&
340+
SR.LineEnd == SM.getSpellingLineNumber(NextTokLoc)) {
341+
SR.LineEnd--;
342+
SR.ColumnEnd++;
324343
}
325-
if (SM.isWrittenInSameFile(LocEnd, NextTokLoc) &&
326-
SR.LineEnd == NextTokLine) {
327-
newSR.LineEnd = SR.LineEnd - 1;
328-
newSR.ColumnEnd = SR.ColumnStart + 1;
329-
}
330-
if (newSR.isInSourceOrder())
331-
return newSR;
344+
if (SR.isInSourceOrder())
345+
return SR;
332346
return None;
333347
}
334348

‎clang/lib/CodeGen/CoverageMappingGen.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,29 @@ struct SkippedRange {
4545
/// Stores additional source code information like skipped ranges which
4646
/// is required by the coverage mapping generator and is obtained from
4747
/// the preprocessor.
48-
class CoverageSourceInfo : public PPCallbacks, public CommentHandler {
48+
class CoverageSourceInfo : public PPCallbacks,
49+
public CommentHandler,
50+
public EmptylineHandler {
4951
// A vector of skipped source ranges and PrevTokLoc with NextTokLoc.
5052
std::vector<SkippedRange> SkippedRanges;
51-
bool AfterComment = false;
53+
54+
SourceManager &SourceMgr;
5255

5356
public:
5457
// Location of the token parsed before HandleComment is called. This is
5558
// updated every time Preprocessor::Lex lexes a new token.
5659
SourceLocation PrevTokLoc;
57-
// The location of token before comment.
58-
SourceLocation BeforeCommentLoc;
60+
61+
CoverageSourceInfo(SourceManager &SourceMgr) : SourceMgr(SourceMgr) {}
5962

6063
std::vector<SkippedRange> &getSkippedRanges() { return SkippedRanges; }
6164

65+
void AddSkippedRange(SourceRange Range);
66+
6267
void SourceRangeSkipped(SourceRange Range, SourceLocation EndifLoc) override;
6368

69+
void HandleEmptyline(SourceRange Range) override;
70+
6471
bool HandleComment(Preprocessor &PP, SourceRange Range) override;
6572

6673
void updateNextTokLoc(SourceLocation Loc);

‎clang/lib/Lex/Lexer.cpp

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ void Lexer::InitLexer(const char *BufStart, const char *BufPtr,
125125

126126
// Default to not keeping comments.
127127
ExtendedTokenMode = 0;
128+
129+
NewLinePtr = nullptr;
128130
}
129131

130132
/// Lexer constructor - Create a new lexer object for the specified buffer
@@ -2197,6 +2199,15 @@ bool Lexer::SkipWhitespace(Token &Result, const char *CurPtr,
21972199

21982200
unsigned char Char = *CurPtr;
21992201

2202+
const char *lastNewLine = nullptr;
2203+
auto setLastNewLine = [&](const char *Ptr) {
2204+
lastNewLine = Ptr;
2205+
if (!NewLinePtr)
2206+
NewLinePtr = Ptr;
2207+
};
2208+
if (SawNewline)
2209+
setLastNewLine(CurPtr - 1);
2210+
22002211
// Skip consecutive spaces efficiently.
22012212
while (true) {
22022213
// Skip horizontal whitespace very aggressively.
@@ -2214,6 +2225,8 @@ bool Lexer::SkipWhitespace(Token &Result, const char *CurPtr,
22142225
}
22152226

22162227
// OK, but handle newline.
2228+
if (*CurPtr == '\n')
2229+
setLastNewLine(CurPtr);
22172230
SawNewline = true;
22182231
Char = *++CurPtr;
22192232
}
@@ -2237,6 +2250,12 @@ bool Lexer::SkipWhitespace(Token &Result, const char *CurPtr,
22372250
if (SawNewline) {
22382251
Result.setFlag(Token::StartOfLine);
22392252
TokAtPhysicalStartOfLine = true;
2253+
2254+
if (NewLinePtr && lastNewLine && NewLinePtr != lastNewLine && PP) {
2255+
if (auto *Handler = PP->getEmptylineHandler())
2256+
Handler->HandleEmptyline(SourceRange(getSourceLocation(NewLinePtr + 1),
2257+
getSourceLocation(lastNewLine)));
2258+
}
22402259
}
22412260

22422261
BufferPtr = CurPtr;
@@ -2377,7 +2396,7 @@ bool Lexer::SkipLineComment(Token &Result, const char *CurPtr,
23772396
// contribute to another token), it isn't needed for correctness. Note that
23782397
// this is ok even in KeepWhitespaceMode, because we would have returned the
23792398
/// comment above in that mode.
2380-
++CurPtr;
2399+
NewLinePtr = CurPtr++;
23812400

23822401
// The next returned token is at the start of the line.
23832402
Result.setFlag(Token::StartOfLine);
@@ -3211,6 +3230,9 @@ bool Lexer::LexTokenInternal(Token &Result, bool TokAtPhysicalStartOfLine) {
32113230
char Char = getAndAdvanceChar(CurPtr, Result);
32123231
tok::TokenKind Kind;
32133232

3233+
if (!isVerticalWhitespace(Char))
3234+
NewLinePtr = nullptr;
3235+
32143236
switch (Char) {
32153237
case 0: // Null.
32163238
// Found end of file?
@@ -3265,6 +3287,7 @@ bool Lexer::LexTokenInternal(Token &Result, bool TokAtPhysicalStartOfLine) {
32653287
// Since we consumed a newline, we are back at the start of a line.
32663288
IsAtStartOfLine = true;
32673289
IsAtPhysicalStartOfLine = true;
3290+
NewLinePtr = CurPtr - 1;
32683291

32693292
Kind = tok::eod;
32703293
break;

‎clang/lib/Lex/Preprocessor.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,6 +1417,8 @@ ModuleLoader::~ModuleLoader() = default;
14171417

14181418
CommentHandler::~CommentHandler() = default;
14191419

1420+
EmptylineHandler::~EmptylineHandler() = default;
1421+
14201422
CodeCompletionHandler::~CodeCompletionHandler() = default;
14211423

14221424
void Preprocessor::createPreprocessingRecord() {

‎clang/test/CoverageMapping/abspath.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -mllvm -enable-name-compression=false -emit-llvm -main-file-name abspath.cpp %S/Inputs/../abspath.cpp -o - | FileCheck -check-prefix=RMDOTS %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -mllvm -enable-name-compression=false -emit-llvm -main-file-name abspath.cpp %S/Inputs/../abspath.cpp -o - | FileCheck -check-prefix=RMDOTS %s
22

33
// RMDOTS: @__llvm_coverage_mapping = {{.*}}"\01
44
// RMDOTS-NOT: Inputs
55
// RMDOTS: "
66

77
// RUN: mkdir -p %t/test && cd %t/test
88
// RUN: echo "void f1() {}" > f1.c
9-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -mllvm -enable-name-compression=false -emit-llvm -main-file-name abspath.cpp ../test/f1.c -o - | FileCheck -check-prefix=RELPATH %s
9+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -mllvm -enable-name-compression=false -emit-llvm -main-file-name abspath.cpp ../test/f1.c -o - | FileCheck -check-prefix=RELPATH %s
1010

1111
// RELPATH: @__llvm_coverage_mapping = {{.*}}"\01
1212
// RELPATH: {{[/\\].*(/|\\\\)test(/|\\\\)f1}}.c

‎clang/test/CoverageMapping/block-storage-starts-region.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -triple x86_64-apple-darwin -fobjc-runtime=macosx-10.10.0 -fblocks -fobjc-arc %s | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -triple x86_64-apple-darwin -fobjc-runtime=macosx-10.10.0 -fblocks -fobjc-arc %s | FileCheck %s
22

33
@interface Foo
44
@end

‎clang/test/CoverageMapping/break.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %strip_comments > %t.stripped.c
2-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name break.c %t.stripped.c | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name break.c %s | FileCheck %s
32

43
int main() { // CHECK: File 0, [[@LINE]]:12 -> {{[0-9]+}}:2 = #0
54
int cnt = 0; // CHECK-NEXT: File 0, [[@LINE+1]]:9 -> [[@LINE+1]]:18 = #0

‎clang/test/CoverageMapping/builtinmacro.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %strip_comments > %t.stripped.c
2-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name builtinmacro.c %t.stripped.c | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name builtinmacro.c %s | FileCheck %s
32

43
// Test the coverage mapping generation for built-in macroes.
54

‎clang/test/CoverageMapping/casts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name casts.c %s | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name casts.c %s | FileCheck %s
22

33
int main() { // CHECK: File 0, [[@LINE]]:12 -> [[@LINE+4]]:2 = #0
44
// CHECK: File 0, [[@LINE+1]]:41 -> [[@LINE+1]]:54 = #1

‎clang/test/CoverageMapping/classtemplate.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %strip_comments > %t.stripped.cpp
2-
// RUN: %clang_cc1 -triple %itanium_abi_triple -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name classtemplate.cpp %t.stripped.cpp > %tmapping
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -triple %itanium_abi_triple -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name classtemplate.cpp %s > %tmapping
32
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-CONSTRUCTOR
43
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-GETTER
54
// RUN: FileCheck -input-file %tmapping %s --check-prefix=CHECK-SETTER

‎clang/test/CoverageMapping/comment-in-macro.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %strip_comments > %t.stripped.c
2-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %t.stripped.c | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
32

43
#define x1 "" // ...
54
#define x2 return 0
@@ -8,5 +7,5 @@ int main() { // CHECK-NEXT: File 0, [[@LINE]]:12 -> [[@LINE+3]]:2 = #0
87
x1; // CHECK-NEXT: Expansion,File 0, [[@LINE]]:3 -> [[@LINE]]:5 = #0
98
x2; // CHECK-NEXT: Expansion,File 0, [[@LINE]]:3 -> [[@LINE]]:5 = #0
109
}
11-
// CHECK-NEXT: File 1, 4:12 -> 4:14 = #0
12-
// CHECK-NEXT: File 2, 5:12 -> 5:20 = #0
10+
// CHECK-NEXT: File 1, 3:12 -> 3:14 = #0
11+
// CHECK-NEXT: File 2, 4:12 -> 4:20 = #0

‎clang/test/CoverageMapping/continue.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %strip_comments > %t.stripped.c
2-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name continue.c %t.stripped.c | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name continue.c %s | FileCheck %s
32

43
int main() { // CHECK: File 0, [[@LINE]]:12 -> [[@LINE+21]]:2 = #0
54
int j = 0; // CHECK-NEXT: File 0, [[@LINE+2]]:18 -> [[@LINE+2]]:24 = (#0 + #1)

‎clang/test/CoverageMapping/control-flow-macro.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s | FileCheck %s
22

33
#define ifc if
44

‎clang/test/CoverageMapping/coroutine.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// fixme: the following line is added to cleanup bots, will be removed in weeks.
22
// RUN: rm -f %S/coroutine.ll
3-
// RUN: %strip_comments > %t.stripped.cpp
4-
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcoroutines-ts -std=c++14 -emit-llvm -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping %t.stripped.cpp -o - | FileCheck %s
3+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -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
54

65
namespace std::experimental {
76
template <typename... T>

‎clang/test/CoverageMapping/decl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Ensure that declarations without definitions don't have maps emitted for them
22

3-
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s > %t
3+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only %s > %t
44
// FileCheck -input-file %t %s
55
// RUN: FileCheck -check-prefix BAR -input-file %t %s
66

‎clang/test/CoverageMapping/default-method.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++17 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name default-method.cpp -w %s | FileCheck %s -implicit-check-not="->"
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -triple %itanium_abi_triple -std=c++17 -fprofile-instrument=clang -fcoverage-mapping -dump-coverage-mapping -emit-llvm-only -main-file-name default-method.cpp -w %s | FileCheck %s -implicit-check-not="->"
22

33
namespace PR39822 {
44
struct unique_ptr {

‎clang/test/CoverageMapping/deferred-region.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %strip_comments > %t.stripped.cpp
2-
// 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 %t.stripped.cpp | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -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
32

43
#define IF if
54
#define STMT(S) S

‎clang/test/CoverageMapping/empty-destructor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clang_cc1 -triple i686-windows -emit-llvm-only -fcoverage-mapping -dump-coverage-mapping -fprofile-instrument=clang %s | FileCheck %s
1+
// RUN: %clang_cc1 -mllvm -emptyline-comment-coverage=false -triple i686-windows -emit-llvm-only -fcoverage-mapping -dump-coverage-mapping -fprofile-instrument=clang %s | FileCheck %s
22

33
struct A {
44
virtual ~A();

0 commit comments

Comments
 (0)