commit fc014f27feb5fe75e7d21507b2b1b0887b159717
author Richard Trieu <rtrieu@google.com> Sat Jan 09 01:10:17 2016 +0000
committer Richard Trieu <rtrieu@google.com> Sat Jan 09 01:10:17 2016 +0000
tree 4b55f370dd44c237013bfed930012b8cb1541c4b
parent e7583d21e3e6e8f3f625b1d21fad442f414ffdfc

Only take NULL macros instead of all macros into account for -Wnull-conversion.

llvm-svn: 257240

clang/lib/Sema/SemaChecking.cpp

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 0c4b59e..98c9ceb 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -7066,8 +7066,12 @@
 
   // __null is usually wrapped in a macro.  Go up a macro if that is the case.
   if (NullKind == Expr::NPCK_GNUNull) {
-    if (Loc.isMacroID())
-      Loc = S.SourceMgr.getImmediateExpansionRange(Loc).first;
+    if (Loc.isMacroID()) {
+      StringRef MacroName =
+          Lexer::getImmediateMacroName(Loc, S.SourceMgr, S.getLangOpts());
+      if (MacroName == "NULL")
+        Loc = S.SourceMgr.getImmediateExpansionRange(Loc).first;
+    }
   }
 
   // Only warn if the null and context location are in the same macro expansion.