From c07315202d597a3d1e04dda8552efee2f6776f59 Mon Sep 17 00:00:00 2001
From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 21 Aug 2004 01:31:27 +0000
Subject: [PATCH] PR c++/17121 * decl.c (expand_static_init): Use
DECL_FUNCTION_SCOPE_P.
PR c++/17121
* g++.dg/inherit/local2.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86353 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/ChangeLog | 5 +++++
gcc/cp/decl.c | 2 +-
gcc/testsuite/ChangeLog | 8 ++++++++
gcc/testsuite/g++.dg/inherit/local1.C | 10 ++++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/inherit/local1.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2b794f05ea2f..c0f488e94a22 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/17121
+ * decl.c (expand_static_init): Use DECL_FUNCTION_SCOPE_P.
+
2004-08-21 Joseph S. Myers <jsm@polyomino.org.uk>
PR c++/17120
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 36e83d9c1a52..d9a74492c1bd 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5151,7 +5151,7 @@ expand_static_init (tree decl, tree init)
&& TYPE_HAS_TRIVIAL_DESTRUCTOR (TREE_TYPE (decl)))
return;
- if (! toplevel_bindings_p ())
+ if (DECL_FUNCTION_SCOPE_P (decl))
{
/* Emit code to perform this initialization but once. */
tree if_stmt;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d096a1b696df..24756293f5f7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/17121
+ * g++.dg/inherit/local2.C: New test.
+
2004-08-21 Joseph S. Myers <jsm@polyomino.org.uk>
PR c++/17120
@@ -5,6 +10,9 @@
2004-08-20 Mark Mitchell <mark@codesourcery.com>
+ PR c++/17121
+ * g++.dg/inherit/local2.C: New test.
+
* gcc.dg/darwin-longlong.c: Include <stdlib.h>.
* gcc.dg/ppc-ldstruct.c: Likewise.
* gcc.dg/ppc64-abi-2.c: Likewise.
diff --git a/gcc/testsuite/g++.dg/inherit/local1.C b/gcc/testsuite/g++.dg/inherit/local1.C
new file mode 100644
index 000000000000..3cb196c38d3c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/inherit/local1.C
@@ -0,0 +1,10 @@
+// PR c++/17121
+
+struct A {
+ virtual ~A() {}
+};
+
+void tsk_tsk()
+{
+ struct B : public A {};
+}
--
GitLab