4 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Analysis/CFRefCount.cpp b/clang/lib/Analysis/CFRefCount.cpp
index 1cfd783492b..3d2e3ac9a89 100644
--- a/clang/lib/Analysis/CFRefCount.cpp
+++ b/clang/lib/Analysis/CFRefCount.cpp
@@ -881,7 +881,7 @@ RetainSummaryManager::getPersistentSummary(ArgEffects AE, RetEffect RetEff,
 //===----------------------------------------------------------------------===//
 
 bool RetainSummaryManager::isTrackedObjCObjectType(QualType Ty) {
-  if (!Ctx.isObjCObjectPointerType(Ty))
+  if (!Ty->isObjCObjectPointerType())
     return false;
 
   const ObjCObjectPointerType *PT = Ty->getAsObjCObjectPointerType();
diff --git a/clang/lib/Analysis/CheckObjCDealloc.cpp b/clang/lib/Analysis/CheckObjCDealloc.cpp
index a14ae265128..7e6023a1f5a 100644
--- a/clang/lib/Analysis/CheckObjCDealloc.cpp
+++ b/clang/lib/Analysis/CheckObjCDealloc.cpp
@@ -108,7 +108,7 @@ void clang::CheckObjCDealloc(ObjCImplementationDecl* D,
     ObjCIvarDecl* ID = *I;
     QualType T = ID->getType();
     
-    if (!Ctx.isObjCObjectPointerType(T) ||
+    if (!T->isObjCObjectPointerType() ||
         ID->getAttr<IBOutletAttr>()) // Skip IBOutlets.
       continue;
     
@@ -210,7 +210,7 @@ void clang::CheckObjCDealloc(ObjCImplementationDecl* D,
       continue;
     
     QualType T = ID->getType();
-    if (!Ctx.isObjCObjectPointerType(T)) // Skip non-pointer ivars
+    if (!T->isObjCObjectPointerType()) // Skip non-pointer ivars
       continue;
 
     const ObjCPropertyDecl* PD = (*I)->getPropertyDecl();
diff --git a/clang/lib/Analysis/GRExprEngineInternalChecks.cpp b/clang/lib/Analysis/GRExprEngineInternalChecks.cpp
index a2ce79a2f39..bb35274cb55 100644
--- a/clang/lib/Analysis/GRExprEngineInternalChecks.cpp
+++ b/clang/lib/Analysis/GRExprEngineInternalChecks.cpp
@@ -718,7 +718,7 @@ public:
           ASTContext &C = BRC.getASTContext();
           if (R->isBoundable()) {
             if (const TypedRegion *TR = dyn_cast<TypedRegion>(R)) {
-              if (C.isObjCObjectPointerType(TR->getValueType(C))) {
+              if (TR->getValueType(C)->isObjCObjectPointerType()) {
                 os << "initialized to nil";
                 b = true;
               }
@@ -749,7 +749,7 @@ public:
         ASTContext &C = BRC.getASTContext();
         if (R->isBoundable()) {
           if (const TypedRegion *TR = dyn_cast<TypedRegion>(R)) {
-            if (C.isObjCObjectPointerType(TR->getValueType(C))) {
+            if (TR->getValueType(C)->isObjCObjectPointerType()) {
               os << "nil object reference stored to ";
               b = true;
             }
diff --git a/clang/lib/Analysis/Store.cpp b/clang/lib/Analysis/Store.cpp
index c7f9eecc738..b939a0df9ca 100644
--- a/clang/lib/Analysis/Store.cpp
+++ b/clang/lib/Analysis/Store.cpp
@@ -55,7 +55,7 @@ StoreManager::NewCastRegion(const GRState *state, const MemRegion* R,
   QualType ToTy = Ctx.getCanonicalType(CastToTy);
 
   // Handle casts to Objective-C objects.
-  if (Ctx.isObjCObjectPointerType(CastToTy)) {
+  if (CastToTy->isObjCObjectPointerType()) {
     state = setCastType(state, R, CastToTy);
     return CastResult(state, R);
   }