commit 3fd50319d3c41ec78e11cfe6acab090de5accf1e
author Anders Carlsson <andersca@mac.com> Sat Nov 06 14:58:53 2010 +0000
committer Anders Carlsson <andersca@mac.com> Sat Nov 06 14:58:53 2010 +0000
tree 064d9ecf7dc00df11cd0e5909111173cec39b271
parent 63abc84630109c5dc00a8471cf5a3efa21a0a1c0

Don't warn when matching %p to nullptr.

llvm-svn: 118344

clang/lib/Analysis/FormatString.cpp

diff --git a/clang/lib/Analysis/FormatString.cpp b/clang/lib/Analysis/FormatString.cpp
index 388b9d3..c1b5ea8 100644
--- a/clang/lib/Analysis/FormatString.cpp
+++ b/clang/lib/Analysis/FormatString.cpp
@@ -296,8 +296,8 @@
     }
 
     case CPointerTy:
-      return argTy->getAs<PointerType>() != NULL ||
-             argTy->getAs<ObjCObjectPointerType>() != NULL;
+      return argTy->isPointerType() || argTy->isObjCObjectPointerType() ||
+        argTy->isNullPtrType();
 
     case ObjCPointerTy:
       return argTy->getAs<ObjCObjectPointerType>() != NULL;

clang/test/SemaCXX/nullptr.cpp

diff --git a/clang/test/SemaCXX/nullptr.cpp b/clang/test/SemaCXX/nullptr.cpp
index 4f6e2e6..666701c 100644
--- a/clang/test/SemaCXX/nullptr.cpp
+++ b/clang/test/SemaCXX/nullptr.cpp
@@ -93,3 +93,12 @@
     f(10, nullptr);
   }
 }
+
+namespace test3 {
+  void f(const char*, ...) __attribute__((format(printf, 1, 2)));
+
+  void g() {
+    // Don't warn when using nullptr with %p.
+    f("%p", nullptr);
+  }
+}