wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[analyzer] Fix macro names in diagnostics within bigger macros. 

If macro "CHECK_X(x)" expands to something like "if (x != NULL) ...",
the "Assuming..." note no longer says "Assuming 'x' is equal to CHECK_X".

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

llvm-svn: 359037
This commit is contained in:
Artem Dergachev 2019-04-23 21:30:30 +00:00
parent ace7a086ca
commit a746f2b73c
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
View File

@ -2002,43 +2002,22 @@ bool ConditionBRVisitor::patternMatch(const Expr *Ex,
const Expr *OriginalExpr = Ex; const Expr *OriginalExpr = Ex;
Ex = Ex->IgnoreParenCasts(); Ex = Ex->IgnoreParenCasts();
// Use heuristics to determine if Ex is a macro expending to a literal and if (isa<GNUNullExpr>(Ex) || isa<ObjCBoolLiteralExpr>(Ex) ||
// if so, use the macro's name. isa<CXXBoolLiteralExpr>(Ex) || isa<IntegerLiteral>(Ex) ||
SourceLocation LocStart = Ex->getBeginLoc(); isa<FloatingLiteral>(Ex)) {
SourceLocation LocEnd = Ex->getEndLoc(); // Use heuristics to determine if the expression is a macro
if (LocStart.isMacroID() && LocEnd.isMacroID() && // expanding to a literal and if so, use the macro's name.
(isa<GNUNullExpr>(Ex) || SourceLocation BeginLoc = OriginalExpr->getBeginLoc();
isa<ObjCBoolLiteralExpr>(Ex) || SourceLocation EndLoc = OriginalExpr->getEndLoc();
isa<CXXBoolLiteralExpr>(Ex) || if (BeginLoc.isMacroID() && EndLoc.isMacroID()) {
isa<IntegerLiteral>(Ex) || SourceManager &SM = BRC.getSourceManager();
isa<FloatingLiteral>(Ex))) { const LangOptions &LO = BRC.getASTContext().getLangOpts();
StringRef StartName = Lexer::getImmediateMacroNameForDiagnostics(LocStart, if (Lexer::isAtStartOfMacroExpansion(BeginLoc, SM, LO) &&
BRC.getSourceManager(), BRC.getASTContext().getLangOpts()); Lexer::isAtEndOfMacroExpansion(EndLoc, SM, LO)) {
StringRef EndName = Lexer::getImmediateMacroNameForDiagnostics(LocEnd, CharSourceRange R = Lexer::getAsCharRange({BeginLoc, EndLoc}, SM, LO);
BRC.getSourceManager(), BRC.getASTContext().getLangOpts()); Out << Lexer::getSourceText(R, SM, LO);
bool beginAndEndAreTheSameMacro = StartName.equals(EndName); return false;
bool partOfParentMacro = false;
if (ParentEx->getBeginLoc().isMacroID()) {
StringRef PName = Lexer::getImmediateMacroNameForDiagnostics(
ParentEx->getBeginLoc(), BRC.getSourceManager(),
BRC.getASTContext().getLangOpts());
partOfParentMacro = PName.equals(StartName);
}
if (beginAndEndAreTheSameMacro && !partOfParentMacro ) {
// Get the location of the macro name as written by the caller.
SourceLocation Loc = LocStart;
while (LocStart.isMacroID()) {
Loc = LocStart;
LocStart = BRC.getSourceManager().getImmediateMacroCallerLoc(LocStart);
} }
StringRef MacroName = Lexer::getImmediateMacroNameForDiagnostics(
Loc, BRC.getSourceManager(), BRC.getASTContext().getLangOpts());
// Return the macro name.
Out << MacroName;
return false;
} }
} }

27
clang/test/Analysis/diagnostics/macros.cpp
View File

@ -3,7 +3,7 @@
#include "../Inputs/system-header-simulator.h" #include "../Inputs/system-header-simulator.h"
#include "../Inputs/system-header-simulator-cxx.h" #include "../Inputs/system-header-simulator-cxx.h"
void testIntMacro(unsigned int i) { void testUnsignedIntMacro(unsigned int i) {
if (i == UINT32_MAX) { // expected-note {{Assuming 'i' is equal to UINT32_MAX}} if (i == UINT32_MAX) { // expected-note {{Assuming 'i' is equal to UINT32_MAX}}
// expected-note@-1 {{Taking true branch}} // expected-note@-1 {{Taking true branch}}
char *p = NULL; // expected-note {{'p' initialized to a null pointer value}} char *p = NULL; // expected-note {{'p' initialized to a null pointer value}}
@ -12,6 +12,20 @@ void testIntMacro(unsigned int i) {
} }
} }
// FIXME: 'i' can never be equal to UINT32_MAX - it doesn't even fit into its
// type ('int'). This should say "Assuming 'i' is equal to -1".
void testIntMacro(int i) {
if (i == UINT32_MAX) { // expected-note {{Assuming 'i' is equal to UINT32_MAX}}
// expected-note@-1 {{Taking true branch}}
char *p = NULL; // expected-note {{'p' initialized to a null pointer value}}
*p = 7; // expected-warning {{Dereference of null pointer (loaded from variable 'p')}}
// expected-note@-1 {{Dereference of null pointer (loaded from variable 'p')}}
}
}
void testNULLMacro(int *p) { void testNULLMacro(int *p) {
if (p == NULL) { // expected-note {{Assuming 'p' is equal to NULL}} if (p == NULL) { // expected-note {{Assuming 'p' is equal to NULL}}
// expected-note@-1 {{Taking true branch}} // expected-note@-1 {{Taking true branch}}
@ -47,3 +61,14 @@ void testboolMacro(bool b, int *p) {
// expected-note@-1 {{Dereference of null pointer (loaded from variable 'p')}} // expected-note@-1 {{Dereference of null pointer (loaded from variable 'p')}}
} }
} }
#define nested_null_split(x) if ((x) != UINT32_MAX) {}
void testNestedNullSplitMacro(int i, int *p) {
nested_null_split(i); // expected-note {{Assuming 'i' is equal to -1}}
// expected-note@-1 {{Taking false branch}}
if (!p) // expected-note {{Assuming 'p' is null}}
// expected-note@-1 {{Taking true branch}}
*p = 1; // expected-warning {{Dereference of null pointer (loaded from variable 'p')}}
// expected-note@-1 {{Dereference of null pointer (loaded from variable 'p')}}
}