From 421bb42c9fc7a786e8263bcff2f09afb4c468bcf Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 28 Jun 2011 23:33:55 +0000
Subject: Revert r133024, "[format strings] correctly suggest correct type for
 '%@' specifiers.  Fixes <rdar://problem/9607158>." because it causes false
 positives on some code that uses CF toll free bridging.  - I'll let Doug or
 Ted figure out the right fix here, possibly just to accept    any pointer
 type.

llvm-svn: 134041
---
 clang/lib/Analysis/FormatString.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'clang/lib/Analysis/FormatString.cpp')

diff --git a/clang/lib/Analysis/FormatString.cpp b/clang/lib/Analysis/FormatString.cpp
index be214e0d86d..c1b5ea8a652 100644
--- a/clang/lib/Analysis/FormatString.cpp
+++ b/clang/lib/Analysis/FormatString.cpp
@@ -300,8 +300,7 @@ bool ArgTypeResult::matchesType(ASTContext &C, QualType argTy) const {
         argTy->isNullPtrType();
 
     case ObjCPointerTy:
-      return argTy->getAs<ObjCObjectPointerType>() != NULL ||
-             argTy->getAs<BlockPointerType>() != NULL;
+      return argTy->getAs<ObjCObjectPointerType>() != NULL;
   }
 
   // FIXME: Should be unreachable, but Clang is currently emitting
-- 
cgit v1.2.3