Patchwork [C++/C] Have -Wpointer-arith enable by -Wpedantic, as documented

login
register
mail settings
Submitter Paolo Carlini
Date April 4, 2013, 11:07 p.m.
Message ID <515E07C9.40608@oracle.com>
Download mbox | patch
Permalink /patch/233981/
State New
Headers show

Comments

Paolo Carlini - April 4, 2013, 11:07 p.m.
Hi,

in the audit trail of c++/56815 Manuel noticed that, inconsistently with 
the documentation, a LangEnabledBy was missing for -Wpointer-arith vs 
-Wpedantic.

Then I noticed that a clean up was possible in the actual pedwarn calls, 
which, in fact, also fixes a bug: we don't want to actually emit such 
warnings for -Wpedantic -Wno-pointer-arith (as would happen before and 
after the trivial tweak above)

I booted & tested the below on x86_64-linux.

Thanks,
Paolo.

///////////////////////////
/c-family
2013-04-04  Paolo Carlini  <paolo.carlini@oracle.com>
            Manuel Lopez-Ibanez  <manu@gcc.gnu.org>

	* c.opt ([Wpointer-arith]): Enabled by -Wpedantic, as documented.
	* c-common.c (pointer_int_sum): Change -Wpointer-arith pedwarns
	to simply use OPT_Wpointer_arith.
	(c_sizeof_or_alignof_type): Likewise.

/cp
2013-04-04  Paolo Carlini  <paolo.carlini@oracle.com>

	* typeck.c (cxx_sizeof_or_alignof_type): Change -Wpointer-arith
	pedwarn to simply use OPT_Wpointer_arith.
	(cp_build_unary_op): Likewise.

/c
2013-04-04  Paolo Carlini  <paolo.carlini@oracle.com>

	* c-typeck.c (pointer_diff): Change -Wpointer-arith pedwarns
	to simply use OPT_Wpointer_arith.
	(build_unary_op): Likewise.

/testsuite
2013-04-04  Paolo Carlini  <paolo.carlini@oracle.com>

	* c-c++-common/Wpointer-arith-1.c: New.
Jason Merrill - April 5, 2013, 3:23 a.m.
The C++ changes are OK.

Jason
Paolo Carlini - April 18, 2013, 7:45 a.m.
Hi,

On 4/5/13 12:07 AM, Paolo Carlini wrote:
> Hi,
>
> in the audit trail of c++/56815 Manuel noticed that, inconsistently 
> with the documentation, a LangEnabledBy was missing for 
> -Wpointer-arith vs -Wpedantic.
>
> Then I noticed that a clean up was possible in the actual pedwarn 
> calls, which, in fact, also fixes a bug: we don't want to actually 
> emit such warnings for -Wpedantic -Wno-pointer-arith (as would happen 
> before and after the trivial tweak above)
the C bits of this Patch are still unreviewed.

Thanks!
Paolo.
Joseph S. Myers - April 24, 2013, 3:25 p.m.
On Fri, 5 Apr 2013, Paolo Carlini wrote:

> Hi,
> 
> in the audit trail of c++/56815 Manuel noticed that, inconsistently with the
> documentation, a LangEnabledBy was missing for -Wpointer-arith vs -Wpedantic.
> 
> Then I noticed that a clean up was possible in the actual pedwarn calls,
> which, in fact, also fixes a bug: we don't want to actually emit such warnings
> for -Wpedantic -Wno-pointer-arith (as would happen before and after the
> trivial tweak above)

The C changes are OK.

Patch

Index: c/c-typeck.c
===================================================================
--- c/c-typeck.c	(revision 197495)
+++ c/c-typeck.c	(working copy)
@@ -3333,10 +3333,10 @@  pointer_diff (location_t loc, tree op0, tree op1)
 
 
   if (TREE_CODE (target_type) == VOID_TYPE)
-    pedwarn (loc, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+    pedwarn (loc, OPT_Wpointer_arith,
 	     "pointer of type %<void *%> used in subtraction");
   if (TREE_CODE (target_type) == FUNCTION_TYPE)
-    pedwarn (loc, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+    pedwarn (loc, OPT_Wpointer_arith,
 	     "pointer to a function used in subtraction");
 
   /* If the conversion to ptrdiff_type does anything like widening or
@@ -3663,10 +3663,10 @@  build_unary_op (location_t location,
 		     || TREE_CODE (TREE_TYPE (argtype)) == VOID_TYPE)
 	      {
 		if (code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR)
-		  pedwarn (location, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+		  pedwarn (location, OPT_Wpointer_arith,
 			   "wrong type argument to increment");
 		else
-		  pedwarn (location, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+		  pedwarn (location, OPT_Wpointer_arith,
 			   "wrong type argument to decrement");
 	      }
 
Index: c-family/c-common.c
===================================================================
--- c-family/c-common.c	(revision 197495)
+++ c-family/c-common.c	(working copy)
@@ -4280,13 +4280,13 @@  pointer_int_sum (location_t loc, enum tree_code re
 
   if (TREE_CODE (TREE_TYPE (result_type)) == VOID_TYPE)
     {
-      pedwarn (loc, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+      pedwarn (loc, OPT_Wpointer_arith,
 	       "pointer of type %<void *%> used in arithmetic");
       size_exp = integer_one_node;
     }
   else if (TREE_CODE (TREE_TYPE (result_type)) == FUNCTION_TYPE)
     {
-      pedwarn (loc, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+      pedwarn (loc, OPT_Wpointer_arith,
 	       "pointer to a function used in arithmetic");
       size_exp = integer_one_node;
     }
@@ -4864,8 +4864,8 @@  c_sizeof_or_alignof_type (location_t loc,
     {
       if (is_sizeof)
 	{
-	  if (complain && (pedantic || warn_pointer_arith))
-	    pedwarn (loc, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+	  if (complain && warn_pointer_arith)
+	    pedwarn (loc, OPT_Wpointer_arith,
 		     "invalid application of %<sizeof%> to a function type");
           else if (!complain)
             return error_mark_node;
@@ -4888,8 +4888,8 @@  c_sizeof_or_alignof_type (location_t loc,
   else if (type_code == VOID_TYPE || type_code == ERROR_MARK)
     {
       if (type_code == VOID_TYPE
-	  && complain && (pedantic || warn_pointer_arith))
-	pedwarn (loc, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+	  && complain && warn_pointer_arith)
+	pedwarn (loc, OPT_Wpointer_arith,
 		 "invalid application of %qs to a void type", op_name);
       else if (!complain)
         return error_mark_node;
Index: c-family/c.opt
===================================================================
--- c-family/c.opt	(revision 197495)
+++ c-family/c.opt	(working copy)
@@ -614,7 +614,7 @@  C++ ObjC++ Var(warn_pmf2ptr) Init(1) Warning
 Warn when converting the type of pointers to member functions
 
 Wpointer-arith
-C ObjC C++ ObjC++ Var(warn_pointer_arith) Warning
+C ObjC C++ ObjC++ Var(warn_pointer_arith) Warning LangEnabledBy(C ObjC C++ ObjC++,Wpedantic)
 Warn about function pointer arithmetic
 
 Wpointer-sign
Index: cp/typeck.c
===================================================================
--- cp/typeck.c	(revision 197495)
+++ cp/typeck.c	(working copy)
@@ -1522,7 +1522,7 @@  cxx_sizeof_or_alignof_type (tree type, enum tree_c
   if (TREE_CODE (type) == METHOD_TYPE)
     {
       if (complain)
-	pedwarn (input_location, pedantic ? OPT_Wpedantic : OPT_Wpointer_arith, 
+	pedwarn (input_location, OPT_Wpointer_arith, 
 		 "invalid application of %qs to a member function", 
 		 operator_name_info[(int) op].name);
       value = size_one_node;
@@ -5577,8 +5577,7 @@  cp_build_unary_op (enum tree_code code, tree xarg,
 	    else if (!TYPE_PTROB_P (argtype)) 
               {
                 if (complain & tf_error)
-                  pedwarn (input_location,
-			   pedantic ? OPT_Wpedantic : OPT_Wpointer_arith,
+                  pedwarn (input_location, OPT_Wpointer_arith,
 			   (code == PREINCREMENT_EXPR
                               || code == POSTINCREMENT_EXPR)
 			   ? G_("ISO C++ forbids incrementing a pointer of type %qT")
Index: testsuite/c-c++-common/Wpointer-arith-1.c
===================================================================
--- testsuite/c-c++-common/Wpointer-arith-1.c	(revision 0)
+++ testsuite/c-c++-common/Wpointer-arith-1.c	(working copy)
@@ -0,0 +1,26 @@ 
+/* { dg-do compile } */
+/* { dg-options "-Wpedantic -Wno-pointer-arith" } */
+
+void h(void)
+{
+  typedef void (*pft) ();
+  typedef void (ft) ();
+
+  void *pv = 0;
+  pft pf = 0;
+
+  pv++;
+  pf++;
+
+  --pv;
+  --pf;
+
+  pv += 1;
+  pf += 1;
+
+  pv = pv - 1;
+  pf = pf - 1;
+
+  sizeof (void);
+  sizeof (ft);
+}