PR c++/69850

	* init.c (build_vec_delete_1): Set TREE_NO_WARNING on the NE_EXPR
	condition.
	* cp-gimplify.c (cp_fold): Propagate TREE_NO_WARNING from binary
	operators if folding preserved the binop, just with different
	arguments.

	* g++.dg/warn/Wnonnull-compare-2.C: New test.
	* g++.dg/warn/Wnonnull-compare-3.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233561 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 77 insertions, 5 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 12a3967114a..dbc674113f8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,12 @@
 2016-02-19  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/69850
+	* init.c (build_vec_delete_1): Set TREE_NO_WARNING on the NE_EXPR
+	condition.
+	* cp-gimplify.c (cp_fold): Propagate TREE_NO_WARNING from binary
+	operators if folding preserved the binop, just with different
+	arguments.
+
 	PR c++/67767
 	* parser.c (cp_parser_std_attribute_spec_seq): Don't assume
 	attr_spec is always single element chain, chain all the attributes
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index d83e9deed07..34bdc827432 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -2068,6 +2068,9 @@ cp_fold (tree x)
       else
 	x = fold (x);
 
+      if (TREE_NO_WARNING (org_x)
+	  && TREE_CODE (x) == TREE_CODE (org_x))
+	TREE_NO_WARNING (x) = 1;
       break;
 
     case VEC_COND_EXPR:
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 68cc1a75cac..19279e36462 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -3678,12 +3678,15 @@ build_vec_delete_1 (tree base, tree maxindex, tree type,
     body = integer_zero_node;
 
   /* Outermost wrapper: If pointer is null, punt.  */
+  tree cond
+    = fold_build2_loc (input_location, NE_EXPR, boolean_type_node, base,
+		       fold_convert (TREE_TYPE (base), nullptr_node));
+  /* This is a compiler generated comparison, don't emit
+     e.g. -Wnonnull-compare warning for it.  */
+  if (TREE_CODE (cond) == NE_EXPR)
+    TREE_NO_WARNING (cond) = 1;
   body = fold_build3_loc (input_location, COND_EXPR, void_type_node,
-		      fold_build2_loc (input_location,
-				   NE_EXPR, boolean_type_node, base,
-				   fold_convert (TREE_TYPE (base),
-						 nullptr_node)),
-		      body, integer_zero_node);
+			  cond, body, integer_zero_node);
   body = build1 (NOP_EXPR, void_type_node, body);
 
   if (controller)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f916c9c7cde..c60de26daa7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2016-02-19  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/69850
+	* g++.dg/warn/Wnonnull-compare-2.C: New test.
+	* g++.dg/warn/Wnonnull-compare-3.C: New test.
+
 	PR c++/67767
 	* g++.dg/cpp0x/pr67767.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull-compare-2.C b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-2.C
new file mode 100644
index 00000000000..641bb6738df
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-2.C
@@ -0,0 +1,27 @@
+// PR c++/69850
+// { dg-do compile }
+// { dg-options "-Wnonnull-compare" }
+
+struct D {
+  virtual ~D ();
+  void foo () const { delete this; }	// { dg-bogus "nonnull argument" }
+  template <typename> friend struct A;
+};
+template <typename T> struct A {
+  static void bar (T *x) { x->foo (); }
+};
+template <typename T> struct B {
+  T b;
+  void baz () { A<T>::bar (&b); }
+};
+class C {
+  class E : public D { ~E (); };
+  void baz ();
+  B<E> c;
+};
+
+void
+C::baz ()
+{
+  c.baz ();
+}
diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull-compare-3.C b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-3.C
new file mode 100644
index 00000000000..f909a0f27d9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-3.C
@@ -0,0 +1,28 @@
+// PR c++/69850
+// { dg-do compile }
+// { dg-options "-Wnonnull-compare" }
+
+template <typename T>
+struct A {
+  static void foo (T *x) { x->bar (); }
+};
+template <typename T>
+struct B {
+  T b;
+  void operator= (B) { A<T>::foo (&b); }
+};
+struct C {
+  void bar () { delete[] this; }	// { dg-bogus "nonnull argument" }
+};
+struct D { B<C> d; };
+struct G {
+  D g[6];
+  void baz ();
+};
+int a;
+
+void
+G::baz ()
+{
+  g[a] = g[1];
+}