diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-08-21 01:31:27 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-08-21 01:31:27 +0000 |
| commit | eba6cfb6b5694f15f880827805ca7d0b0907c60d (patch) | |
| tree | 5a4dc0263593f8742bb84846ad855a9faf04539d /gcc | |
| parent | bcf9a914ff833d8df23e10613443fb13c11a506f (diff) | |
| download | gcc-eba6cfb6b5694f15f880827805ca7d0b0907c60d.zip gcc-eba6cfb6b5694f15f880827805ca7d0b0907c60d.tar.gz gcc-eba6cfb6b5694f15f880827805ca7d0b0907c60d.tar.bz2 | |
re PR c++/17121 (Link problem with function-local classes)
PR c++/17121
* decl.c (expand_static_init): Use DECL_FUNCTION_SCOPE_P.
PR c++/17121
* g++.dg/inherit/local2.C: New test.
From-SVN: r86353
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/inherit/local1.C | 10 |
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2b794f0..c0f488e 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 36e83d9..d9a7449 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 d096a1b..2475629 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 0000000..3cb196c --- /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 {}; +} |