From c1ff3cd5fe4436bb14309fdc5ee7e1c2b702b7c3 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Wed, 30 Apr 2008 22:48:21 +0000 Subject: [PATCH] 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 --- lib/Analysis/BasicObjCFoundationChecks.cpp | 16 ++++++++-------- lib/Analysis/RValues.cpp | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/Analysis/BasicObjCFoundationChecks.cpp b/lib/Analysis/BasicObjCFoundationChecks.cpp index d2a3d08b8e..bb16df91c6 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 @@ static ObjCInterfaceType* GetReceiverType(ObjCMessageExpr* ME) { 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(T->getPointeeType().getTypePtr()); + if (X->isPointerType()) { + Type* TP = X.getTypePtr(); + const PointerType* T = TP->getAsPointerType(); + return dyn_cast(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 85c3b23efd..60c349420a 100644 --- a/lib/Analysis/RValues.cpp +++ b/lib/Analysis/RValues.cpp @@ -235,8 +235,9 @@ RVal RVal::GetSymbolValue(SymbolManager& SymMgr, VarDecl* D) { QualType T = D->getType(); - if (T->isPointerLikeType()) + if (T->isPointerLikeType() || T->isObjCQualifiedIdType()) return lval::SymbolVal(SymMgr.getSymbol(D)); + return nonlval::SymbolVal(SymMgr.getSymbol(D)); } -- 2.40.0