Skip to content

Commit

Permalink
[analyzer] PR41335: Fix crash when no-store event is in a body-farmed…
Browse files Browse the repository at this point in the history
… function.

Stuffing invalid source locations (such as those in functions produced by
body farms) into path diagnostics causes crashes.

Fix a typo in a nearby function name.

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

llvm-svn: 358945
  • Loading branch information
haoNoQ committed Apr 23, 2019
1 parent 8c6119a commit e2a8e43
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 6 deletions.
Expand Up @@ -313,6 +313,8 @@ class PathDiagnosticLocation {

bool hasRange() const { return K == StmtK || K == RangeK || K == DeclK; }

bool hasValidLocation() const { return asLocation().isValid(); }

void invalidate() {
*this = PathDiagnosticLocation();
}
Expand Down Expand Up @@ -468,7 +470,7 @@ class PathDiagnosticSpotPiece : public PathDiagnosticPiece {
PathDiagnosticPiece::Kind k,
bool addPosRange = true)
: PathDiagnosticPiece(s, k), Pos(pos) {
assert(Pos.isValid() && Pos.asLocation().isValid() &&
assert(Pos.isValid() && Pos.hasValidLocation() &&
"PathDiagnosticSpotPiece's must have a valid location.");
if (addPosRange && Pos.hasRange()) addRange(Pos.asRange());
}
Expand Down
13 changes: 8 additions & 5 deletions clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
Expand Up @@ -335,7 +335,7 @@ class NoStoreFuncVisitor final : public BugReporterVisitor {
if (RegionOfInterest->isSubRegionOf(SelfRegion) &&
potentiallyWritesIntoIvar(Call->getRuntimeDefinition().getDecl(),
IvarR->getDecl()))
return maybeEmitNode(R, *Call, N, {}, SelfRegion, "self",
return maybeEmitNote(R, *Call, N, {}, SelfRegion, "self",
/*FirstIsReferenceType=*/false, 1);
}
}
Expand All @@ -344,7 +344,7 @@ class NoStoreFuncVisitor final : public BugReporterVisitor {
const MemRegion *ThisR = CCall->getCXXThisVal().getAsRegion();
if (RegionOfInterest->isSubRegionOf(ThisR)
&& !CCall->getDecl()->isImplicit())
return maybeEmitNode(R, *Call, N, {}, ThisR, "this",
return maybeEmitNote(R, *Call, N, {}, ThisR, "this",
/*FirstIsReferenceType=*/false, 1);

// Do not generate diagnostics for not modified parameters in
Expand All @@ -363,15 +363,15 @@ class NoStoreFuncVisitor final : public BugReporterVisitor {
QualType T = PVD->getType();
while (const MemRegion *MR = V.getAsRegion()) {
if (RegionOfInterest->isSubRegionOf(MR) && !isPointerToConst(T))
return maybeEmitNode(R, *Call, N, {}, MR, ParamName,
return maybeEmitNote(R, *Call, N, {}, MR, ParamName,
ParamIsReferenceType, IndirectionLevel);

QualType PT = T->getPointeeType();
if (PT.isNull() || PT->isVoidType()) break;

if (const RecordDecl *RD = PT->getAsRecordDecl())
if (auto P = findRegionOfInterestInRecord(RD, State, MR))
return maybeEmitNode(R, *Call, N, *P, RegionOfInterest, ParamName,
return maybeEmitNote(R, *Call, N, *P, RegionOfInterest, ParamName,
ParamIsReferenceType, IndirectionLevel);

V = State->getSVal(MR, PT);
Expand Down Expand Up @@ -549,7 +549,7 @@ class NoStoreFuncVisitor final : public BugReporterVisitor {
/// \return Diagnostics piece for region not modified in the current function,
/// if it decides to emit one.
std::shared_ptr<PathDiagnosticPiece>
maybeEmitNode(BugReport &R, const CallEvent &Call, const ExplodedNode *N,
maybeEmitNote(BugReport &R, const CallEvent &Call, const ExplodedNode *N,
const RegionVector &FieldChain, const MemRegion *MatchedRegion,
StringRef FirstElement, bool FirstIsReferenceType,
unsigned IndirectionLevel) {
Expand Down Expand Up @@ -579,6 +579,9 @@ class NoStoreFuncVisitor final : public BugReporterVisitor {
PathDiagnosticLocation L =
PathDiagnosticLocation::create(N->getLocation(), SM);

if (!L.hasValidLocation())
return nullptr;

SmallString<256> sbuf;
llvm::raw_svector_ostream os(sbuf);
os << "Returning without writing to '";
Expand Down
20 changes: 20 additions & 0 deletions clang/test/Analysis/OSAtomic_mac.c
@@ -0,0 +1,20 @@
// RUN: %clang_analyze_cc1 -w -analyzer-checker=core,debug.ExprInspection \
// RUN: -analyzer-output=text -verify %s

int OSAtomicCompareAndSwapPtrBarrier(*, *, **);
int OSAtomicCompareAndSwapPtrBarrier() {
// There is some body in the actual header,
// but we should trust our BodyFarm instead.
}

int *invalidSLocOnRedecl() {
int *b; // expected-note{{'b' declared without an initial value}}

OSAtomicCompareAndSwapPtrBarrier(0, 0, &b); // no-crash
// FIXME: We don't really need these notes.
// expected-note@-2{{Calling 'OSAtomicCompareAndSwapPtrBarrier'}}
// expected-note@-3{{Returning from 'OSAtomicCompareAndSwapPtrBarrier'}}

return b; // expected-warning{{Undefined or garbage value returned to caller}}
// expected-note@-1{{Undefined or garbage value returned to caller}}
}

0 comments on commit e2a8e43

Please sign in to comment.