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, 49 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C b/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C
new file mode 100644
index 000000000..c3050f612
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C
@@ -0,0 +1,49 @@
+// { dg-do link  }
+// { dg-options "" }
+
+#include <cstddef>
+
+void g(int) {}
+void g(long) {}
+void g(long long) {}
+extern void g(void*);
+
+template <int I>
+void h() {}
+
+void k(int) {}
+
+template <class T>
+void l(T);
+
+template <>
+void l(int) {}
+
+template <>
+void l(long) {}
+
+template <>
+void l(long long) {}
+
+int main()
+{
+  int i = NULL; // { dg-warning "" } converting NULL to non-pointer type
+  float z = NULL; // { dg-warning "" } converting NULL to non-pointer type
+  int a[2];
+
+  i != NULL; // { dg-warning "" } NULL used in arithmetic
+  NULL != z; // { dg-warning "" } NULL used in arithmetic
+  k != NULL; // No warning: decay conversion
+  NULL != a; // Likewise.
+  -NULL;     // { dg-warning "" } converting NULL to non-pointer type
+  +NULL;     // { dg-warning "" } converting NULL to non-pointer type
+  ~NULL;     // { dg-warning "" } converting NULL to non-pointer type
+  a[NULL] = 3; // { dg-warning "" } converting NULL to non-pointer-type
+  i = NULL;  // { dg-warning "" } converting NULL to non-pointer type
+  z = NULL;  // { dg-warning "" } converting NULL to non-pointer type
+  k(NULL);   // { dg-warning "" } converting NULL to int
+  g(NULL);   // { dg-warning "" } converting NULL to int
+  h<NULL>(); // No warning: NULL bound to integer template parameter
+  l(NULL);   // { dg-warning "" } converting NULL to int
+  NULL && NULL; // No warning: converting NULL to bool is OK
+}