obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 55 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/warn/null4.C b/gcc/testsuite/g++.dg/warn/null4.C
new file mode 100644
index 000000000..6aa4a097f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/null4.C
@@ -0,0 +1,55 @@
+// PR c++/24745 : warnings for NULL constant.
+// { dg-do compile  }
+// { dg-options "-Wpointer-arith -Wconversion " }
+
+#include <cstddef>
+
+int foo (void) 
+{
+  if (NULL == 1) return -1;   // { dg-warning "NULL used in arithmetic" } 
+  if (NULL > NULL) return -1; // { dg-warning "NULL used in arithmetic" } 
+  if (NULL < NULL) return -1; // { dg-warning "NULL used in arithmetic" } 
+  if (NULL >= 0) return -1;   // { dg-warning "NULL used in arithmetic" } 
+  if (NULL <= 0) return -1;   // { dg-warning "NULL used in arithmetic" } 
+  // Adding to the NULL pointer, which has no specific type, should
+  // result in a warning; the type of the resulting expression is
+  // actually "int", not a pointer type.
+  if (NULL + 1) return -1;    // { dg-warning "NULL used in arithmetic" }
+  if (1 + NULL) return -1;    // { dg-warning "NULL used in arithmetic" }
+  return 0;
+}
+
+int *ip;
+
+struct S {};
+typedef int S::*SPD;
+typedef void (S::*SPF)(void);
+SPD spd;
+SPF spf;
+
+int bar (void) 
+{
+  if (NULL) return -1;
+  if (!NULL) return -1;
+  if (!NULL == 1) return -1;
+  if (NULL || NULL) return -1;
+  if (!NULL && NULL) return -1;
+  if (NULL == NULL) return -1;
+  if (NULL != NULL) return -1;
+  if (NULL == 0) return -1;
+  if (NULL != 0) return -1;
+  // Subtraction of pointers is vaild, so using NULL is OK.
+  if (ip - NULL) return -1;
+  if (NULL - NULL) return -1;
+  // Comparing NULL with a pointer-to-member is OK.
+  if (NULL == spd) return -1;
+  if (spd == NULL) return -1;
+  if (NULL != spd) return -1;
+  if (spd != NULL) return -1;
+  if (NULL == spf) return -1;
+  if (spf == NULL) return -1;
+  if (NULL != spf) return -1;
+  if (spf != NULL) return -1;
+
+  return 0;
+}