diff --git a/clang/lib/Analysis/CheckObjCDealloc.cpp b/clang/lib/Analysis/CheckObjCDealloc.cpp
index 6da52ba..a67f84a 100644
--- a/clang/lib/Analysis/CheckObjCDealloc.cpp
+++ b/clang/lib/Analysis/CheckObjCDealloc.cpp
@@ -71,9 +71,9 @@
     ObjCIvarDecl* ID = *I;
     QualType T = ID->getType();
     
-    if ((T->isPointerType() || T->isObjCQualifiedIdType()) &&
-        (ID->getAttr<IBOutletAttr>() == 0 && // Skip IBOutlets.
-         !isSEL(T, SelII))) { // Skip SEL ivars.
+    if ((T->isPointerType() || Ctx.isObjCObjectPointerType(T)) &&
+         (ID->getAttr<IBOutletAttr>() == 0 && // Skip IBOutlets.
+          !isSEL(T, SelII))) { // Skip SEL ivars.
       containsPointerIvar = true;
       break;
     }