More cleanups with ObjCQualifiedIdType in the static analyzer.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@50503 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/BasicObjCFoundationChecks.cpp b/lib/Analysis/BasicObjCFoundationChecks.cpp
index d2a3d08..bb16df9 100644
--- a/lib/Analysis/BasicObjCFoundationChecks.cpp
+++ b/lib/Analysis/BasicObjCFoundationChecks.cpp
@@ -16,7 +16,6 @@
#include "BasicObjCFoundationChecks.h"
#include "clang/Analysis/PathSensitive/ExplodedGraph.h"
-#include "clang/Analysis/PathSensitive/GRExprEngine.h"
#include "clang/Analysis/PathSensitive/GRSimpleAPICheck.h"
#include "clang/Analysis/PathSensitive/ValueState.h"
#include "clang/Analysis/PathSensitive/BugReporter.h"
@@ -36,15 +35,16 @@
if (!Receiver)
return NULL;
- // FIXME: Cleanup
QualType X = Receiver->getType();
- Type* TP = X.getTypePtr();
- assert (IsPointerType(X));
-
- const PointerType* T = TP->getAsPointerType();
-
- return dyn_cast<ObjCInterfaceType>(T->getPointeeType().getTypePtr());
+ if (X->isPointerType()) {
+ Type* TP = X.getTypePtr();
+ const PointerType* T = TP->getAsPointerType();
+ return dyn_cast<ObjCInterfaceType>(T->getPointeeType().getTypePtr());
+ }
+
+ // FIXME: Support ObjCQualifiedIdType?
+ return NULL;
}
static const char* GetReceiverNameType(ObjCMessageExpr* ME) {
diff --git a/lib/Analysis/RValues.cpp b/lib/Analysis/RValues.cpp
index 85c3b23..60c3494 100644
--- a/lib/Analysis/RValues.cpp
+++ b/lib/Analysis/RValues.cpp
@@ -235,8 +235,9 @@
QualType T = D->getType();
- if (T->isPointerLikeType())
+ if (T->isPointerLikeType() || T->isObjCQualifiedIdType())
return lval::SymbolVal(SymMgr.getSymbol(D));
+
return nonlval::SymbolVal(SymMgr.getSymbol(D));
}