From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 9 Jun 2014 19:28:37 +0000 (+0000)
Subject: re PR c++/22556 (extern array: compatible declaration at function scope refused)
X-Git-Tag: releases/gcc-5.1.0~6999
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23646391f243274745cf31e66d914061570a4c45;p=thirdparty%2Fgcc.git

re PR c++/22556 (extern array: compatible declaration at function scope refused)

/cp
2014-06-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/22556
	* name-lookup.c (pushdecl_maybe_friend_1): Use comptypes.

/testsuite
2014-06-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/22556
	* g++.dg/other/redecl3.C: New.

From-SVN: r211385
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 38a348cb9976..6b2068868b56 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/22556
+	* name-lookup.c (pushdecl_maybe_friend_1): Use comptypes.
+
 2014-06-07  Jan Hubicka  <hubicka@ucw.cz>
 
 	* method.c (use_thunk): Use set_decl_section_name.
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 2baeeb76d184..90f51083915b 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 b3e391a130cc..06bdfa6d062d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/22556
+	* g++.dg/other/redecl3.C: New.
+
 2014-06-09  Marc Glisse  <marc.glisse@inria.fr>
 
 	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 000000000000..6d35bf53e9d3
--- /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
+}