replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[analyzer] Do not add invalid source location to the coverage information 

Invalid source locations may arise from generated code.

Differential Revision: https://reviews.llvm.org/D51761

llvm-svn: 341618
This commit is contained in:
George Karpenkov 2018-09-07 00:43:17 +00:00
parent 5f8d361c9c
commit 55e3d1ec35
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/StaticAnalyzer/Core/BugReporter.cpp
View File

@ -1892,6 +1892,7 @@ static void updateExecutedLinesWithDiagnosticPieces(
FullSourceLoc Loc = P->getLocation().asLocation().getExpansionLoc();
FileID FID = Loc.getFileID();
unsigned LineNo = Loc.getLineNumber();
assert(FID.isValid());
ExecutedLines[FID.getHashValue()].insert(LineNo);
}
}
@ -3022,6 +3023,8 @@ static void populateExecutedLinesWithFunctionSignature(
SourceLocation Start = SignatureSourceRange.getBegin();
SourceLocation End = Body ? Body->getSourceRange().getBegin()
: SignatureSourceRange.getEnd();
if (!Start.isValid() || !End.isValid())
return;
unsigned StartLine = SM.getExpansionLineNumber(Start);
unsigned EndLine = SM.getExpansionLineNumber(End);
@ -3034,6 +3037,8 @@ static void populateExecutedLinesWithStmt(
const Stmt *S, SourceManager &SM,
std::unique_ptr<FilesToLineNumsMap> &ExecutedLines) {
SourceLocation Loc = S->getSourceRange().getBegin();
if (!Loc.isValid())
return;
SourceLocation ExpansionLoc = SM.getExpansionLoc(Loc);
FileID FID = SM.getFileID(ExpansionLoc);
unsigned LineNo = SM.getExpansionLineNumber(ExpansionLoc);

25
clang/test/Analysis/html_diagnostics/relevant_lines/synthesized_body.cpp Normal file
View File

@ -0,0 +1,25 @@
// Faking std::call_once implementation.
namespace std {
typedef struct once_flag_s {
int _M_once = 0;
} once_flag;
template <class Callable, class... Args>
void call_once(once_flag &o, Callable&& func, Args&&... args);
} // namespace std
int deref(int *x) {
return *x;
}
void call_deref_once() {
static std::once_flag once;
int *p = nullptr;
std::call_once(once, &deref, p);
}
// RUN: rm -rf %t.output
// RUN: %clang_analyze_cc1 -analyze -analyzer-checker=core -analyzer-output html -o %t.output %s
// RUN: cat %t.output/* | FileCheck %s --match-full-lines
// CHECK: var relevant_lines = {"1": {"3": 1, "8": 1, "11": 1, "12": 1, "15": 1, "16": 1, "17": 1, "18": 1}};