commit 421bb42c9fc7a786e8263bcff2f09afb4c468bcf
author Daniel Dunbar <daniel@zuster.org> Tue Jun 28 23:33:55 2011 +0000
committer Daniel Dunbar <daniel@zuster.org> Tue Jun 28 23:33:55 2011 +0000
tree 614ad532d77176d1eab2be8a8244b24d43c4784e
parent dedd7d6ed6cc73d0cb1b2ddf3bea8a08262c7051

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

diff --git a/clang/lib/Analysis/FormatString.cpp b/clang/lib/Analysis/FormatString.cpp
index be214e0..c1b5ea8 100644
--- a/clang/lib/Analysis/FormatString.cpp
+++ b/clang/lib/Analysis/FormatString.cpp
@@ -300,8 +300,7 @@
         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

clang/lib/Analysis/PrintfFormatString.cpp

diff --git a/clang/lib/Analysis/PrintfFormatString.cpp b/clang/lib/Analysis/PrintfFormatString.cpp
index 270308a..00b0b27 100644
--- a/clang/lib/Analysis/PrintfFormatString.cpp
+++ b/clang/lib/Analysis/PrintfFormatString.cpp
@@ -348,8 +348,6 @@
       return Ctx.WCharTy;
     case ConversionSpecifier::pArg:
       return ArgTypeResult::CPointerTy;
-    case ConversionSpecifier::ObjCObjArg:
-      return ArgTypeResult::ObjCPointerTy;
     default:
       break;
   }