From: Mark Mitchell <mark@codesourcery.com>
Date: Wed, 25 Aug 2004 20:06:30 +0000 (+0000)
Subject: re PR c++/17155 (Another link problem with function-local classes)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6dc36fed57925986b31b724fd4869656e1d41ac0;p=gcc.git

re PR c++/17155 (Another link problem with function-local classes)

	PR c++/17155
	* lex.c (build_lang_decl): Set DECL_NO_STATIC_CHAIN for all C++
	functions.

	PR c++/17155
	* g++.dg/inherit/local2.C: New test.

From-SVN: r86571
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3b5498e2635..c895d54698c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-25  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/17155
+	* lex.c (build_lang_decl): Set DECL_NO_STATIC_CHAIN for all C++
+	functions.
+
 	* mangle.c (get_identifier_nocopy): Add cast.
 
 	* cp-tree.h (mangle_type): Remove.
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index fe220f2ae24..fc0a5abb5c3 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -649,6 +649,11 @@ build_lang_decl (enum tree_code code, tree name, tree type)
   t = build_decl (code, name, type);
   retrofit_lang_decl (t);
 
+  /* All nesting of C++ functions is lexical; there is never a "static
+     chain" in the sense of GNU C nested functions.  */
+  if (code == FUNCTION_DECL) 
+    DECL_NO_STATIC_CHAIN (t) = 1;
+
   return t;
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 888b38a94d2..0b6efa8dd15 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-25  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/17155
+	* g++.dg/inherit/local2.C: New test.
+
 2004-08-25  Paul Brook  <paul@codesourcery.com>
 
 	PR fortran/17144
diff --git a/gcc/testsuite/g++.dg/inherit/local2.C b/gcc/testsuite/g++.dg/inherit/local2.C
new file mode 100644
index 00000000000..82d812ca270
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/local2.C
@@ -0,0 +1,16 @@
+// PR c++/17155
+// { dg-do link }
+
+struct A {
+  virtual ~A() {}
+};
+
+
+void tsk_tsk(void)
+{
+  struct B : public A {
+    B(int) {}
+  };
+}
+
+int main () {}