[analyzer] Fix a false positive of the 'self' initialization checker.
A common pattern in classes with multiple initializers is to put the
subclass's common initialization bits into a static function that receives
the value of 'self', e.g:
if (!(self = [super init]))
return nil;
if (!(self = _commonInit(self)))
return nil;
It was reported that 'self' was not set to the result of [super init].
Until we can use inter-procedural analysis, in such a call, transfer the
ObjCSelfInitChecker flags associated with 'self' to the result of the call.
Fixes rdar://8937441 & http://llvm.org/PR9094
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124940 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp b/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
index ff1e5dd..786a588 100644
--- a/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
@@ -135,9 +135,7 @@
static void addSelfFlag(SVal val, SelfFlagEnum flag, CheckerContext &C) {
const GRState *state = C.getState();
- // FIXME: We tag the symbol that the SVal wraps but this is conceptually
- // wrong, we should tag the SVal; the fact that there is a symbol behind the
- // SVal is irrelevant.
+ // We tag the symbol that the SVal wraps.
if (SymbolRef sym = val.getAsSymbol())
C.addTransition(state->set<SelfFlag>(sym, getSelfFlags(val, C) | flag));
}
@@ -227,7 +225,19 @@
// When a call receives a reference to 'self', [Pre/Post]VisitGenericCall pass
// the SelfFlags from the object 'self' point to before the call, to the new
-// object after the call.
+// object after the call. This is to avoid invalidation of 'self' by logging
+// functions.
+// Another common pattern in classes with multiple initializers is to put the
+// subclass's common initialization bits into a static function that receives
+// the value of 'self', e.g:
+// @code
+// if (!(self = [super init]))
+// return nil;
+// if (!(self = _commonInit(self)))
+// return nil;
+// @endcode
+// Until we can use inter-procedural analysis, in such a call, transfer the
+// SelfFlags to the result of the call.
void ObjCSelfInitChecker::PreVisitGenericCall(CheckerContext &C,
const CallExpr *CE) {
@@ -238,6 +248,9 @@
if (isSelfVar(argV, C)) {
preCallSelfFlags = getSelfFlags(state->getSVal(cast<Loc>(argV)), C);
return;
+ } else if (hasSelfFlag(argV, SelfFlag_Self, C)) {
+ preCallSelfFlags = getSelfFlags(argV, C);
+ return;
}
}
}
@@ -251,6 +264,9 @@
if (isSelfVar(argV, C)) {
addSelfFlag(state->getSVal(cast<Loc>(argV)), preCallSelfFlags, C);
return;
+ } else if (hasSelfFlag(argV, SelfFlag_Self, C)) {
+ addSelfFlag(state->getSVal(CE), preCallSelfFlags, C);
+ return;
}
}
}