Teach the static analysis engine about ObjCQualifiedIdType.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@50493 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 9ed4f1d..08bad5b 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -335,8 +335,7 @@
if (strcmp("CFTypeRef", TDName) != 0)
return NULL;
- if (!ArgT->isPointerType())
- return NULL;
+ assert (ArgT->isPointerType() || ArgT->isObjCQualifiedIdType());
QualType RetTy = FT->getResultType();
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index 770a133..22205c0 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -28,6 +28,10 @@
using llvm::cast;
using llvm::APSInt;
+static inline bool IsPointerType(QualType T) {
+ return T->isPointerType() || T->isObjCQualifiedIdType();
+}
+
//===----------------------------------------------------------------------===//
// Engine construction and deletion.
//===----------------------------------------------------------------------===//
@@ -786,7 +790,7 @@
// abstract address of the base object.
NodeSet Tmp;
- if (Base->getType()->isPointerType()) // Base always is an LVal.
+ if (IsPointerType(Base->getType())) // Base always is an LVal.
Visit(Base, Pred, Tmp);
else
VisitLVal(Base, Pred, Tmp);
@@ -823,7 +827,7 @@
// abstract address of the base object.
NodeSet Tmp;
- if (Base->getType()->isPointerType()) // Base always is an LVal.
+ if (IsPointerType(Base->getType())) // Base always is an LVal.
Visit(Base, Pred, Tmp);
else
VisitLVal(Base, Pred, Tmp);
@@ -1269,7 +1273,7 @@
}
// Check for casts from pointers to integers.
- if (T->isIntegerType() && ExTy->isPointerType()) {
+ if (T->isIntegerType() && IsPointerType(ExTy)) {
unsigned bits = getContext().getTypeSize(ExTy);
// FIXME: Determine if the number of bits of the target type is
@@ -1282,7 +1286,7 @@
}
// Check for casts from integers to pointers.
- if (T->isPointerType() && ExTy->isIntegerType())
+ if (IsPointerType(T) && ExTy->isIntegerType())
if (nonlval::LValAsInteger *LV = dyn_cast<nonlval::LValAsInteger>(&V)) {
// Just unpackage the lval and return it.
V = LV->getLVal();
@@ -1361,7 +1365,7 @@
QualType T = VD->getType();
- if (T->isPointerType())
+ if (IsPointerType(T))
St = SetRVal(St, lval::DeclVal(VD),
lval::ConcreteInt(BasicVals.getValue(0, T)));
else if (T->isIntegerType())
@@ -1379,7 +1383,7 @@
QualType T = VD->getType();
- if (T->isPointerType() || T->isIntegerType()) {
+ if (IsPointerType(T) || T->isIntegerType()) {
RVal V = Ex ? GetRVal(St, Ex) : UndefinedVal();
@@ -1390,7 +1394,7 @@
unsigned Count = Builder->getCurrentBlockCount();
SymbolID Sym = SymMgr.getConjuredSymbol(Ex, Count);
- V = Ex->getType()->isPointerType()
+ V = IsPointerType(Ex->getType())
? cast<RVal>(lval::SymbolVal(Sym))
: cast<RVal>(nonlval::SymbolVal(Sym));
}
@@ -1833,7 +1837,7 @@
unsigned Count = Builder->getCurrentBlockCount();
SymbolID Sym = SymMgr.getConjuredSymbol(B->getRHS(), Count);
- RightV = B->getRHS()->getType()->isPointerType()
+ RightV = IsPointerType(B->getRHS()->getType())
? cast<RVal>(lval::SymbolVal(Sym))
: cast<RVal>(nonlval::SymbolVal(Sym));
}