From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 19 Dec 2003 21:10:03 +0000 (+0000)
Subject: 	PR c++/12795
X-Git-Tag: upstream/4.9.2~74568
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3932a15930eaebf578fb6285943fa51a2353df3;p=platform%2Fupstream%2Flinaro-gcc.git

	PR c++/12795
	* name-lookup.c (pushdecl): Do not treated any functions as being
	"nested" in C++.

	PR c++/12795
	* g++.dg/ext/attrib10.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74849 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6888140..19813dc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-19  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/12795
+	* name-lookup.c (pushdecl): Do not treated any functions as being
+	"nested" in C++.
+
 2003-12-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/13371
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 43c02cf..97c4cbf 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -562,7 +562,7 @@ pushdecl (tree x)
       if (current_function_decl && x != current_function_decl
 	  /* A local declaration for a function doesn't constitute
              nesting.  */
-	  && !(TREE_CODE (x) == FUNCTION_DECL && !DECL_INITIAL (x))
+	  && TREE_CODE (x) != FUNCTION_DECL
 	  /* A local declaration for an `extern' variable is in the
 	     scope of the current namespace, not the current
 	     function.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 33e006e..dd13133 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-19  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/12795
+	* g++.dg/ext/attrib10.C: New test.
+
 2003-12-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.dg/cleanup-10.c: New test.
diff --git a/gcc/testsuite/g++.dg/ext/attrib10.C b/gcc/testsuite/g++.dg/ext/attrib10.C
new file mode 100644
index 0000000..6d04cb8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attrib10.C
@@ -0,0 +1,7 @@
+// PR c++/12795
+
+void foo()
+{
+  extern void bar () __attribute__ ((__alias__ ("BAR")));
+  bar ();
+}