Skip to content

R
riscv-gcc-1
Commit 8e5e53da by Richard Kenner
Options

(duplicate_decls): Suppress -Wredundant-decls warning if we have 

already given an error.

From-SVN: r7900
parent 7b9032dd
Showing with 3 additions and 2 deletions
gcc/c-decl.c
...@@ -1303,6 +1303,7 @@ duplicate_decls (newdecl, olddecl) ...@@ -1303,6 +1303,7 @@ duplicate_decls (newdecl, olddecl)
&& DECL_INITIAL (newdecl) != 0); && DECL_INITIAL (newdecl) != 0);
tree oldtype = TREE_TYPE (olddecl); tree oldtype = TREE_TYPE (olddecl);
tree newtype = TREE_TYPE (newdecl); tree newtype = TREE_TYPE (newdecl);
char *errmsg = 0;
if (TREE_CODE (newtype) == ERROR_MARK if (TREE_CODE (newtype) == ERROR_MARK
|| TREE_CODE (oldtype) == ERROR_MARK) || TREE_CODE (oldtype) == ERROR_MARK)
...@@ -1528,7 +1529,7 @@ duplicate_decls (newdecl, olddecl) ...@@ -1528,7 +1529,7 @@ duplicate_decls (newdecl, olddecl)
} }
else else
{ {
char *errmsg = redeclaration_error_message (newdecl, olddecl); errmsg = redeclaration_error_message (newdecl, olddecl);
if (errmsg) if (errmsg)
{ {
error_with_decl (newdecl, errmsg); error_with_decl (newdecl, errmsg);
...@@ -1625,7 +1626,7 @@ duplicate_decls (newdecl, olddecl) ...@@ -1625,7 +1626,7 @@ duplicate_decls (newdecl, olddecl)
} }
/* Optionally warn about more than one declaration for the same name. */ /* Optionally warn about more than one declaration for the same name. */
if (warn_redundant_decls && DECL_SOURCE_LINE (olddecl) != 0 if (errmsg = 0 && warn_redundant_decls && DECL_SOURCE_LINE (olddecl) != 0
/* Dont warn about a function declaration /* Dont warn about a function declaration
followed by a definition. */ followed by a definition. */
&& !(TREE_CODE (newdecl) == FUNCTION_DECL && DECL_INITIAL (newdecl) != 0 && !(TREE_CODE (newdecl) == FUNCTION_DECL && DECL_INITIAL (newdecl) != 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment