diff mbox

C PATCH to fix c/79758 (ICE-on-invalid with function redefinition and old style decls)

Message ID 20170302173545.GJ3172@redhat.com
State New
Headers show

Commit Message

Marek Polacek March 2, 2017, 5:35 p.m. UTC 
This patch fixes an ICE-on-invalid where we redefine a function whose prototype
parameter list contains error_mark_node, which then causes a crash in
store_parm_decls_oldstyle.  Fixed by adding yet another error_mark_node check.

While at it, I fixed wrong formatting in the nearby code.  Also use NULL_TREE
instead of 0 where appropriate.  I really dislike those zeros-as-trees; one
day I'll just go and turn them into NULL_TREEs.

I also fixed missing TREE_VALUE (), which is what I think was intended there.

Bootstrapped/regtested on x86_64-linux, ok for trunk?

2017-03-02  Marek Polacek  <polacek@redhat.com>

	PR c/79758
	* c-decl.c (store_parm_decls_oldstyle): Check if the element of
	current_function_prototype_arg_types is error_mark_node.  Fix
	formatting.  Add TREE_VALUE.

	* gcc.dg/noncompile/pr79758.c: New test.


	Marek

Comments

Bernd Schmidt March 2, 2017, 7:47 p.m. UTC | #1 
On 03/02/2017 06:35 PM, Marek Polacek wrote:
> While at it, I fixed wrong formatting in the nearby code.  Also use NULL_TREE
> instead of 0 where appropriate.  I really dislike those zeros-as-trees; one
> day I'll just go and turn them into NULL_TREEs.

I sympathize, but it makes it harder to see which parts of the patch are 
actual changes. Generally it's best to separate functional and 
formatting changes.

> @@ -8996,7 +8999,7 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info)
>  	     declared for the arg.  ISO C says we take the unqualified
>  	     type for parameters declared with qualified type.  */
>  	  if (TREE_TYPE (parm) != error_mark_node
> -	      && TREE_TYPE (type) != error_mark_node
> +	      && TREE_TYPE (TREE_VALUE (type)) != error_mark_node
>  	      && ((TYPE_ATOMIC (DECL_ARG_TYPE (parm))
>  		   != TYPE_ATOMIC (TREE_VALUE (type)))
>  		  || !comptypes (TYPE_MAIN_VARIANT (DECL_ARG_TYPE (parm)),

Isn't this most likely intended to be TREE_VALUE (type) != error_mark_node?

> @@ -9017,7 +9020,7 @@ store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info)
>  		  if (targetm.calls.promote_prototypes (TREE_TYPE (current_function_decl))
>  		      && INTEGRAL_TYPE_P (TREE_TYPE (parm))
>  		      && TYPE_PRECISION (TREE_TYPE (parm))
> -		      < TYPE_PRECISION (integer_type_node))
> +			 < TYPE_PRECISION (integer_type_node))

Should add the necessary parens while fixing formatting.


Bernd
diff mbox

Patch

diff --git gcc/c/c-decl.c gcc/c/c-decl.c
index 32edacc..e3bf898 100644
--- gcc/c/c-decl.c
+++ gcc/c/c-decl.c
@@ -8965,12 +8965,15 @@  store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info)
       tree type;
       for (parm = DECL_ARGUMENTS (fndecl),
 	     type = current_function_prototype_arg_types;
-	   parm || (type && TREE_VALUE (type) != error_mark_node
-                   && (TYPE_MAIN_VARIANT (TREE_VALUE (type)) != void_type_node));
+	   parm || (type != NULL_TREE
+		    && TREE_VALUE (type) != error_mark_node
+		    && TYPE_MAIN_VARIANT (TREE_VALUE (type)) != void_type_node);
 	   parm = DECL_CHAIN (parm), type = TREE_CHAIN (type))
 	{
-	  if (parm == 0 || type == 0
-	      || TYPE_MAIN_VARIANT (TREE_VALUE (type)) == void_type_node)
+	  if (parm == NULL_TREE
+	      || type == NULL_TREE
+	      || (TREE_VALUE (type) != error_mark_node
+		  && TYPE_MAIN_VARIANT (TREE_VALUE (type)) == void_type_node))
 	    {
 	      if (current_function_prototype_built_in)
 		warning_at (DECL_SOURCE_LOCATION (fndecl),
@@ -8996,7 +8999,7 @@  store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info)
 	     declared for the arg.  ISO C says we take the unqualified
 	     type for parameters declared with qualified type.  */
 	  if (TREE_TYPE (parm) != error_mark_node
-	      && TREE_TYPE (type) != error_mark_node
+	      && TREE_TYPE (TREE_VALUE (type)) != error_mark_node
 	      && ((TYPE_ATOMIC (DECL_ARG_TYPE (parm))
 		   != TYPE_ATOMIC (TREE_VALUE (type)))
 		  || !comptypes (TYPE_MAIN_VARIANT (DECL_ARG_TYPE (parm)),
@@ -9017,7 +9020,7 @@  store_parm_decls_oldstyle (tree fndecl, const struct c_arg_info *arg_info)
 		  if (targetm.calls.promote_prototypes (TREE_TYPE (current_function_decl))
 		      && INTEGRAL_TYPE_P (TREE_TYPE (parm))
 		      && TYPE_PRECISION (TREE_TYPE (parm))
-		      < TYPE_PRECISION (integer_type_node))
+			 < TYPE_PRECISION (integer_type_node))
 		    DECL_ARG_TYPE (parm)
 		      = c_type_promotes_to (TREE_TYPE (parm));
 
diff --git gcc/testsuite/gcc.dg/noncompile/pr79758.c gcc/testsuite/gcc.dg/noncompile/pr79758.c
index e69de29..aeaf7c7 100644
--- gcc/testsuite/gcc.dg/noncompile/pr79758.c
+++ gcc/testsuite/gcc.dg/noncompile/pr79758.c
@@ -0,0 +1,6 @@ 
+/* PR c/79758 */
+/* { dg-do compile } */
+
+void fn1 (int[a]) { }; /* { dg-error "undeclared here|parameter name omitted" } */
+void fn1 (b) { }; /* { dg-error "redefinition" } */
+/* { dg-warning "defaults to 'int'" "" { target *-*-* } .-1 } */