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

[analyzer] Use a more robust check for null in CallAndMessageChecker. 

This should fix the failing test on the buildbot as well.

llvm-svn: 161290
This commit is contained in:
Jordan Rose 2012-08-04 01:04:52 +00:00
parent c51171e0e9
commit a01741fce4
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
View File

@ -232,7 +232,11 @@ void CallAndMessageChecker::checkPreStmt(const CallExpr *CE,
return;
}
if (L.isZeroConstant()) {
ProgramStateRef StNonNull, StNull;
llvm::tie(StNonNull, StNull) = State->assume(cast<DefinedOrUnknownSVal>(L));
// FIXME: Do we want to record the non-null assumption here?
if (StNull && !StNonNull) {
if (!BT_call_null)
BT_call_null.reset(
new BuiltinBug("Called function pointer is null (null dereference)"));
@ -253,7 +257,13 @@ void CallAndMessageChecker::checkPreCall(const CallEvent &Call,
emitBadCall(BT_cxx_call_undef.get(), C, CC->getCXXThisExpr());
return;
}
if (V.isZeroConstant()) {
ProgramStateRef State = C.getState();
ProgramStateRef StNonNull, StNull;
llvm::tie(StNonNull, StNull) = State->assume(cast<DefinedOrUnknownSVal>(V));
// FIXME: Do we want to record the non-null assumption here?
if (StNull && !StNonNull) {
if (!BT_cxx_call_null)
BT_cxx_call_null.reset(new BuiltinBug("Called C++ object pointer "
"is null"));

8
clang/test/Analysis/misc-ps-region-store.cpp
View File

@ -272,11 +272,11 @@ const Rdar9212495_A& rdar9212495(const Rdar9212495_C* ptr) {
const Rdar9212495_A& val = dynamic_cast<const Rdar9212495_A&>(*ptr);
// This is not valid C++; dynamic_cast with a reference type will throw an
// exception if the pointer does not match the expected type.
// exception if the pointer does not match the expected type. However, our
// implementation of dynamic_cast will pass through a null pointer...or a
// "null reference"! So this branch is actually possible.
if (&val == 0) {
val.bar(); // no warning (unreachable)
int *p = 0;
*p = 0xDEAD; // no warning (unreachable)
val.bar(); // expected-warning{{Called C++ object pointer is null}}
}
return val;