PR 13656
* c-decl.c (diagnose_mismatched_decls): Whenever newtype or
oldtype is set, set *newtypep or *oldtypep too. Do not set
them at the very end.
(validate_proto_after_old_defn): Restructure for comprehensibility;
make error messages clearer.
testsuite:
* gcc.dg/typedef-redecl.c: New test case.
* gcc.dg/typedef-redecl.h: New support file.
From-SVN: r75787
+2004-01-12 Zack Weinberg <zack@codesourcery.com>
+
+ PR 13656
+ * c-decl.c (diagnose_mismatched_decls): Whenever newtype or
+ oldtype is set, set *newtypep or *oldtypep too. Do not set
+ them at the very end.
+ (validate_proto_after_old_defn): Restructure for comprehensibility;
+ make error messages clearer.
+
2004-01-12 Zack Weinberg <zack@codesourcery.com>
* varray.h (VARRAY_POP): Add checking variant, aborts on underflow.
2004-01-12 Zack Weinberg <zack@codesourcery.com>
* varray.h (VARRAY_POP): Add checking variant, aborts on underflow.
static bool
validate_proto_after_old_defn (tree newdecl, tree newtype, tree oldtype)
{
static bool
validate_proto_after_old_defn (tree newdecl, tree newtype, tree oldtype)
{
- tree type, parm;
- int nargs;
- /* Prototype decl follows defn w/o prototype. */
-
- for (parm = TYPE_ACTUAL_ARG_TYPES (oldtype),
- type = TYPE_ARG_TYPES (newtype),
- nargs = 1;
- ;
- parm = TREE_CHAIN (parm), type = TREE_CHAIN (type), nargs++)
- {
- if (TYPE_MAIN_VARIANT (TREE_VALUE (parm)) == void_type_node
- && TYPE_MAIN_VARIANT (TREE_VALUE (type)) == void_type_node)
+ tree newargs, oldargs;
+ int i;
+
+ /* ??? Elsewhere TYPE_MAIN_VARIANT is not used in this context. */
+#define END_OF_ARGLIST(t) (TYPE_MAIN_VARIANT (t) == void_type_node)
+
+ oldargs = TYPE_ACTUAL_ARG_TYPES (oldtype);
+ newargs = TYPE_ARG_TYPES (newtype);
+ i = 1;
+
+ for (;;)
+ {
+ tree oldargtype = TREE_VALUE (oldargs);
+ tree newargtype = TREE_VALUE (newargs);
+
+ if (END_OF_ARGLIST (oldargtype) && END_OF_ARGLIST (newargtype))
+ break;
+
+ /* Reaching the end of just one list means the two decls don't
+ agree on the number of arguments. */
+ if (END_OF_ARGLIST (oldargtype))
- /* End of list. */
- warning ("%Jprototype for '%D' follows non-prototype definition",
- newdecl, newdecl);
- return true;
+ error ("%Jprototype for '%D' declares more arguments "
+ "than previous old-style definition", newdecl, newdecl);
+ return false;
-
- if (TYPE_MAIN_VARIANT (TREE_VALUE (parm)) == void_type_node
- || TYPE_MAIN_VARIANT (TREE_VALUE (type)) == void_type_node)
+ else if (END_OF_ARGLIST (newargtype))
- error ("%Jprototype for '%D' with different number of arguments "
- "follows non-prototype definition", newdecl, newdecl);
+ error ("%Jprototype for '%D' declares fewer arguments "
+ "than previous old-style definition", newdecl, newdecl);
- /* Type for passing arg must be consistent
- with that declared for the arg. */
- if (! comptypes (TREE_VALUE (parm), TREE_VALUE (type),
- COMPARE_STRICT))
+
+ /* Type for passing arg must be consistent with that declared
+ for the arg. */
+ else if (! comptypes (oldargtype, newargtype, COMPARE_STRICT))
- error ("%Jprototype for '%D' with incompatible argument %d "
- "follows non-prototype definition", newdecl, newdecl, nargs);
+ error ("%Jprototype for '%D' declares arg %d with incompatible type",
+ newdecl, newdecl, i);
+
+ oldargs = TREE_CHAIN (oldargs);
+ newargs = TREE_CHAIN (newargs);
+ i++;
+
+ /* If we get here, no errors were found, but do issue a warning
+ for this poor-style construct. */
+ warning ("%Jprototype for '%D' follows non-prototype definition",
+ newdecl, newdecl);
+ return true;
+#undef END_OF_ARGLIST
}
/* Subroutine of diagnose_mismatched_decls. Report the location of DECL,
}
/* Subroutine of diagnose_mismatched_decls. Report the location of DECL,
the previous decl - we're in an error cascade already. */
if (olddecl == error_mark_node || newdecl == error_mark_node)
return false;
the previous decl - we're in an error cascade already. */
if (olddecl == error_mark_node || newdecl == error_mark_node)
return false;
- oldtype = TREE_TYPE (olddecl);
- newtype = TREE_TYPE (newdecl);
+ *oldtypep = oldtype = TREE_TYPE (olddecl);
+ *newtypep = newtype = TREE_TYPE (newdecl);
if (oldtype == error_mark_node || newtype == error_mark_node)
return false;
if (oldtype == error_mark_node || newtype == error_mark_node)
return false;
tree trytype = match_builtin_function_types (newtype, oldtype);
if (trytype && comptypes (newtype, trytype, COMPARE_STRICT))
tree trytype = match_builtin_function_types (newtype, oldtype);
if (trytype && comptypes (newtype, trytype, COMPARE_STRICT))
+ *oldtypep = oldtype = trytype;
else
{
/* If types don't match for a built-in, throw away the
else
{
/* If types don't match for a built-in, throw away the
{
pedwarn ("%Jconflicting types for '%D'", newdecl, newdecl);
/* Make sure we keep void as the return type. */
{
pedwarn ("%Jconflicting types for '%D'", newdecl, newdecl);
/* Make sure we keep void as the return type. */
- TREE_TYPE (newdecl) = newtype = oldtype;
+ TREE_TYPE (newdecl) = *newtypep = newtype = oldtype;
C_FUNCTION_IMPLICIT_INT (newdecl) = 0;
pedwarned = true;
}
C_FUNCTION_IMPLICIT_INT (newdecl) = 0;
pedwarned = true;
}
if (warned || pedwarned)
locate_old_decl (olddecl, pedwarned ? pedwarn : warning);
if (warned || pedwarned)
locate_old_decl (olddecl, pedwarned ? pedwarn : warning);
- *newtypep = newtype;
- *oldtypep = oldtype;
+2004-01-12 Zack Weinberg <zack@codesourcery.com>
+
+ PR 13656
+ * gcc.dg/typedef-redecl.c: New test case.
+ * gcc.dg/typedef-redecl.h: New support file.
+
2004-01-13 Jan Hubicka <jh@suse.cz>
* gcc.dg/always_inline.c: New test.
2004-01-13 Jan Hubicka <jh@suse.cz>
* gcc.dg/always_inline.c: New test.
--- /dev/null
+/* Redeclaration of typedef (invalid but accepted in system headers)
+ causes ICE; PR 13656. Test case by Richard Sandiford <rsandifo@redhat.com>,
+ reduced from glibc. */
+
+#include "typedef-redecl.h"
+x a;
--- /dev/null
+/* Redeclaration of typedef (invalid but accepted in system headers)
+ causes ICE; PR 13656. Test case by Richard Sandiford <rsandifo@redhat.com>,
+ reduced from glibc. */
+
+#pragma GCC system_header
+typedef int x;
+typedef int x;