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

[analyzer] NFC: RetainCount: Protect from dumping raw region to path notes. 

MemRegion::getString() is a wrapper around MemRegion::dump(), which is not
user-friendly and should never be used for diagnostic messages.

Actual cases where raw dumps were reaching the user were unintentionally fixed
in r315736; these were noticed accidentally and shouldn't be reproducible
anymore. For now RetainCountChecker only tracks pointers through variable
regions, and for those dumps are "fine". However, we should still use a less
dangerous method for producing our path notes.

This patch replaces the dump with printing a variable name, asserting that this
is indeed a variable.

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

llvm-svn: 322799
This commit is contained in:
Artem Dergachev 2018-01-18 01:01:56 +00:00
parent b60a80a37b
commit db6ca05a6b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
View File

@ -1929,6 +1929,12 @@ static bool isNumericLiteralExpression(const Expr *E) {
isa<CXXBoolLiteralExpr>(E); isa<CXXBoolLiteralExpr>(E);
} }
static std::string describeRegion(const MemRegion *MR) {
// Once we support more storage locations for bindings,
// this would need to be improved.
return cast<VarRegion>(MR)->getDecl()->getName();
}
/// Returns true if this stack frame is for an Objective-C method that is a /// Returns true if this stack frame is for an Objective-C method that is a
/// property getter or setter whose body has been synthesized by the analyzer. /// property getter or setter whose body has been synthesized by the analyzer.
static bool isSynthesizedAccessor(const StackFrameContext *SFC) { static bool isSynthesizedAccessor(const StackFrameContext *SFC) {
@ -2395,7 +2401,7 @@ CFRefLeakReportVisitor::getEndPath(BugReporterContext &BRC,
if (FirstBinding) { if (FirstBinding) {
os << "object allocated and stored into '" os << "object allocated and stored into '"
<< FirstBinding->getString() << '\''; << describeRegion(FirstBinding) << '\'';
} }
else else
os << "allocated object"; os << "allocated object";
@ -2523,7 +2529,7 @@ void CFRefLeakReport::createDescription(CheckerContext &Ctx, bool GCEnabled, boo
os << "of an object"; os << "of an object";
if (AllocBinding) { if (AllocBinding) {
os << " stored into '" << AllocBinding->getString() << '\''; os << " stored into '" << describeRegion(AllocBinding) << '\'';
if (IncludeAllocationLine) { if (IncludeAllocationLine) {
FullSourceLoc SL(AllocStmt->getLocStart(), Ctx.getSourceManager()); FullSourceLoc SL(AllocStmt->getLocStart(), Ctx.getSourceManager());
os << " (allocated on line " << SL.getSpellingLineNumber() << ")"; os << " (allocated on line " << SL.getSpellingLineNumber() << ")";