From 835648fec898c65ca3aedfc550802ea954c67fde Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 9 Jun 2014 19:28:37 +0000 Subject: [PATCH] /cp 2014-06-09 Paolo Carlini PR c++/22556 * name-lookup.c (pushdecl_maybe_friend_1): Use comptypes. /testsuite 2014-06-09 Paolo Carlini PR c++/22556 * g++.dg/other/redecl3.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211385 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/name-lookup.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/other/redecl3.C | 9 +++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/other/redecl3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 38a348c..6b20688 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-09 Paolo Carlini + + PR c++/22556 + * name-lookup.c (pushdecl_maybe_friend_1): Use comptypes. + 2014-06-07 Jan Hubicka * method.c (use_thunk): Use set_decl_section_name. diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 2baeeb7..90f5108 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -974,7 +974,8 @@ pushdecl_maybe_friend_1 (tree x, bool is_friend) && (DECL_EXTERNAL (decl) || TREE_PUBLIC (decl)) /* If different sort of thing, we already gave an error. */ && TREE_CODE (decl) == TREE_CODE (x) - && !same_type_p (TREE_TYPE (x), TREE_TYPE (decl))) + && !comptypes (TREE_TYPE (x), TREE_TYPE (decl), + COMPARE_REDECLARATION)) { if (permerror (input_location, "type mismatch with previous " "external decl of %q#D", x)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b3e391a..06bdfa6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-09 Paolo Carlini + + PR c++/22556 + * g++.dg/other/redecl3.C: New. + 2014-06-09 Marc Glisse PR c++/54442 diff --git a/gcc/testsuite/g++.dg/other/redecl3.C b/gcc/testsuite/g++.dg/other/redecl3.C new file mode 100644 index 0000000..6d35bf5 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/redecl3.C @@ -0,0 +1,9 @@ +// PR c++/22556 + +extern int foo[]; // OK +int foo[] = {1,2,3}; +extern int foo[]; // OK + +void bar(){ + extern int foo[]; // g++: ERROR -- SHOULD BE OK +} -- 2.7.4