Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 1843a20

Browse files
committed
[C++11] Use 'nullptr'. StaticAnalyzer edition.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@209642 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 9d0a0d8 commit 1843a20

Some content is hidden

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

65 files changed

+550
-530
lines changed

Diff for: lib/StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class AnalyzerStatsChecker : public Checker<check::EndAnalysis> {
4141
void AnalyzerStatsChecker::checkEndAnalysis(ExplodedGraph &G,
4242
BugReporter &B,
4343
ExprEngine &Eng) const {
44-
const CFG *C = 0;
44+
const CFG *C = nullptr;
4545
const SourceManager &SM = B.getSourceManager();
4646
llvm::SmallPtrSet<const CFGBlock*, 256> reachable;
4747

Diff for: lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class RegionRawOffsetV2 {
4545
private:
4646
const SubRegion *baseRegion;
4747
SVal byteOffset;
48-
48+
4949
RegionRawOffsetV2()
50-
: baseRegion(0), byteOffset(UnknownVal()) {}
50+
: baseRegion(nullptr), byteOffset(UnknownVal()) {}
5151

5252
public:
5353
RegionRawOffsetV2(const SubRegion* base, SVal offset)

Diff for: lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp

+14-13
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ class CFNumberCreateChecker : public Checker< check::PreStmt<CallExpr> > {
346346
mutable std::unique_ptr<APIMisuse> BT;
347347
mutable IdentifierInfo* II;
348348
public:
349-
CFNumberCreateChecker() : II(0) {}
349+
CFNumberCreateChecker() : II(nullptr) {}
350350

351351
void checkPreStmt(const CallExpr *CE, CheckerContext &C) const;
352352

@@ -531,7 +531,8 @@ class CFRetainReleaseChecker : public Checker< check::PreStmt<CallExpr> > {
531531
mutable std::unique_ptr<APIMisuse> BT;
532532
mutable IdentifierInfo *Retain, *Release, *MakeCollectable;
533533
public:
534-
CFRetainReleaseChecker(): Retain(0), Release(0), MakeCollectable(0) {}
534+
CFRetainReleaseChecker()
535+
: Retain(nullptr), Release(nullptr), MakeCollectable(nullptr) {}
535536
void checkPreStmt(const CallExpr *CE, CheckerContext &C) const;
536537
};
537538
} // end anonymous namespace
@@ -840,7 +841,7 @@ class ObjCLoopChecker
840841
CheckerContext &C) const;
841842

842843
public:
843-
ObjCLoopChecker() : CountSelectorII(0) {}
844+
ObjCLoopChecker() : CountSelectorII(nullptr) {}
844845
void checkPostStmt(const ObjCForCollectionStmt *FCS, CheckerContext &C) const;
845846
void checkPostObjCMessage(const ObjCMethodCall &M, CheckerContext &C) const;
846847
void checkDeadSymbols(SymbolReaper &SymReaper, CheckerContext &C) const;
@@ -880,7 +881,7 @@ static ProgramStateRef checkCollectionNonNil(CheckerContext &C,
880881
ProgramStateRef State,
881882
const ObjCForCollectionStmt *FCS) {
882883
if (!State)
883-
return NULL;
884+
return nullptr;
884885

885886
SVal CollectionVal = C.getSVal(FCS->getCollection());
886887
Optional<DefinedSVal> KnownCollection = CollectionVal.getAs<DefinedSVal>();
@@ -891,7 +892,7 @@ static ProgramStateRef checkCollectionNonNil(CheckerContext &C,
891892
std::tie(StNonNil, StNil) = State->assume(*KnownCollection);
892893
if (StNil && !StNonNil) {
893894
// The collection is nil. This path is infeasible.
894-
return NULL;
895+
return nullptr;
895896
}
896897

897898
return StNonNil;
@@ -905,7 +906,7 @@ static ProgramStateRef checkElementNonNil(CheckerContext &C,
905906
ProgramStateRef State,
906907
const ObjCForCollectionStmt *FCS) {
907908
if (!State)
908-
return NULL;
909+
return nullptr;
909910

910911
// See if the collection is one where we /know/ the elements are non-nil.
911912
if (!isKnownNonNilCollectionType(FCS->getCollection()->getType()))
@@ -918,7 +919,7 @@ static ProgramStateRef checkElementNonNil(CheckerContext &C,
918919
Optional<Loc> ElementLoc;
919920
if (const DeclStmt *DS = dyn_cast<DeclStmt>(Element)) {
920921
const VarDecl *ElemDecl = cast<VarDecl>(DS->getSingleDecl());
921-
assert(ElemDecl->getInit() == 0);
922+
assert(ElemDecl->getInit() == nullptr);
922923
ElementLoc = State->getLValue(ElemDecl, LCtx);
923924
} else {
924925
ElementLoc = State->getSVal(Element, LCtx).getAs<Loc>();
@@ -945,7 +946,7 @@ assumeCollectionNonEmpty(CheckerContext &C, ProgramStateRef State,
945946
const bool *KnownNonEmpty = State->get<ContainerNonEmptyMap>(CollectionS);
946947
if (!KnownNonEmpty)
947948
return State->set<ContainerNonEmptyMap>(CollectionS, Assumption);
948-
return (Assumption == *KnownNonEmpty) ? State : NULL;
949+
return (Assumption == *KnownNonEmpty) ? State : nullptr;
949950
}
950951

951952
SValBuilder &SvalBuilder = C.getSValBuilder();
@@ -970,7 +971,7 @@ assumeCollectionNonEmpty(CheckerContext &C, ProgramStateRef State,
970971
const ObjCForCollectionStmt *FCS,
971972
bool Assumption) {
972973
if (!State)
973-
return NULL;
974+
return nullptr;
974975

975976
SymbolRef CollectionS =
976977
State->getSVal(FCS->getCollection(), C.getLocationContext()).getAsSymbol();
@@ -1085,11 +1086,11 @@ void ObjCLoopChecker::checkPostObjCMessage(const ObjCMethodCall &M,
10851086
static SymbolRef getMethodReceiverIfKnownImmutable(const CallEvent *Call) {
10861087
const ObjCMethodCall *Message = dyn_cast_or_null<ObjCMethodCall>(Call);
10871088
if (!Message)
1088-
return 0;
1089+
return nullptr;
10891090

10901091
const ObjCMethodDecl *MD = Message->getDecl();
10911092
if (!MD)
1092-
return 0;
1093+
return nullptr;
10931094

10941095
const ObjCInterfaceDecl *StaticClass;
10951096
if (isa<ObjCProtocolDecl>(MD->getDeclContext())) {
@@ -1102,11 +1103,11 @@ static SymbolRef getMethodReceiverIfKnownImmutable(const CallEvent *Call) {
11021103
}
11031104

11041105
if (!StaticClass)
1105-
return 0;
1106+
return nullptr;
11061107

11071108
switch (findKnownClass(StaticClass, /*IncludeSuper=*/false)) {
11081109
case FC_None:
1109-
return 0;
1110+
return nullptr;
11101111
case FC_NSArray:
11111112
case FC_NSDictionary:
11121113
case FC_NSEnumerator:

0 commit comments

Comments
 (0)