[PATCH] PR15279: -use-nullptr behaves badly with assert()

[Tareq A. Siraj]

  Removed un-necessary checks for macro id and added space before CHECK in the test.

Hi klimek,

http://llvm-reviews.chandlerc.com/D415

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D415?vs=1003&id=1004#toc

Files:
  cpp11-migrate/UseNullptr/NullptrActions.cpp
  test/cpp11-migrate/UseNullptr/basic.cpp

Index: cpp11-migrate/UseNullptr/NullptrActions.cpp
===================================================================
--- cpp11-migrate/UseNullptr/NullptrActions.cpp
+++ cpp11-migrate/UseNullptr/NullptrActions.cpp
@@ -57,6 +57,10 @@
       SourceLocation StartLoc = FirstCast->getLocStart();
       SourceLocation EndLoc = FirstCast->getLocEnd();
 
+      // If the start/end location is a macro, get the expansion location.
+      StartLoc = SM.getFileLoc(StartLoc);
+      EndLoc = SM.getFileLoc(EndLoc);
+
       if (SM.getFileID(StartLoc) == SM.getFileID(EndLoc) &&
           SM.isFromMainFile(StartLoc) && SM.isFromMainFile(EndLoc)) {
         CharSourceRange Range(SourceRange(StartLoc, EndLoc), true);
@@ -100,10 +104,9 @@
     if (SM.getFileID(StartLoc) != SM.getFileID(EndLoc))
       return;
 
-    if (StartLoc.isMacroID())
-      StartLoc = SM.getExpansionLoc(StartLoc);
-    if (EndLoc.isMacroID())
-      EndLoc = SM.getExpansionLoc(EndLoc);
+    // If the start/end location is a macro, get the expansion location.
+    StartLoc = SM.getFileLoc(StartLoc);
+    EndLoc = SM.getFileLoc(EndLoc);
 
     if (!SM.isFromMainFile(StartLoc) || !SM.isFromMainFile(EndLoc))
       return;
Index: test/cpp11-migrate/UseNullptr/basic.cpp
===================================================================
--- test/cpp11-migrate/UseNullptr/basic.cpp
+++ test/cpp11-migrate/UseNullptr/basic.cpp
@@ -178,3 +178,29 @@
   return g_null;
   // CHECK: return g_null;
 }
+
+// Test function-like macros where the parameter to the macro (expression)
+// results in a nullptr.
+void __dummy_assert_fail() {}
+
+void test_function_like_macro1() {
+  // This tests that the CastSequenceVisitor is working properly.
+#define my_assert(expr) \
+  ((expr) ? static_cast<void>(expr) : __dummy_assert_fail())
+
+  int *p;
+  my_assert(p != 0);
+  // CHECK: my_assert(p != nullptr);
+#undef my_assert
+}
+
+void test_function_like_macro2() {
+  // This tests that the implicit cast is working properly.
+#define my_macro(expr) \
+  (expr)
+
+  int *p;
+  my_macro(p != 0);
+  // CHECK: my_macro(p != nullptr);
+#undef my_macro
+}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D415.2.patch
Type: text/x-patch
Size: 2118 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130215/c88a507c/attachment.bin>