diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-11-22 15:06:06 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-11-22 15:06:06 +0100 |
| commit | 6d1f904c2efb86125ae06ec5ac348a2e55499706 (patch) | |
| tree | 601e495b96713f8dbe7fc634c22ee24e8dea18a1 /gcc | |
| parent | 60f2c09056530a7c118e52a6859ea764bd555fcf (diff) | |
| download | gcc-6d1f904c2efb86125ae06ec5ac348a2e55499706.zip gcc-6d1f904c2efb86125ae06ec5ac348a2e55499706.tar.gz gcc-6d1f904c2efb86125ae06ec5ac348a2e55499706.tar.bz2 | |
re PR c++/34094 (Undefined static data member in anonymous namespace can acquire a definition anyway)
PR c++/34094
* decl2.c (cp_write_global_declarations): Issue error about static
data members in anonymous namespace which are declared and used,
but not defined.
* g++.dg/ext/visibility/anon7.C: New test.
From-SVN: r130351
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/visibility/anon7.C | 23 |
4 files changed, 50 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a8025f2..ae3cc02 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2007-11-22 Jakub Jelinek <jakub@redhat.com> + + PR c++/34094 + * decl2.c (cp_write_global_declarations): Issue error about static + data members in anonymous namespace which are declared and used, + but not defined. + 2007-11-20 Jakub Jelinek <jakub@redhat.com> PR c++/34089 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index d3ca117..bf3d598 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3365,7 +3365,21 @@ cp_write_global_declarations (void) /* If this static data member is needed, provide it to the back end. */ if (DECL_NOT_REALLY_EXTERN (decl) && decl_needed_p (decl)) - DECL_EXTERNAL (decl) = 0; + { + /* Error on + namespace { struct A { static int i; }; } + int foo () { return A::i; } + without A::i definition (which can't be defined in + a different CU because of the anonymous namespace). + Don't do this if DECL_INITIAL is set, because for + namespace { struct A { static const int i = 4; } }; + decl_needed_p won't reliably detect whether it was + really needed. */ + if (DECL_IN_AGGR_P (decl) && DECL_INITIAL (decl) == NULL_TREE) + error ("%Jstatic data member %qD used, but not defined", + decl, decl); + DECL_EXTERNAL (decl) = 0; + } } if (VEC_length (tree, pending_statics) != 0 && wrapup_global_declarations (VEC_address (tree, pending_statics), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7380eb8..ccd81e9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-22 Jakub Jelinek <jakub@redhat.com> + + PR c++/34094 + * g++.dg/ext/visibility/anon7.C: New test. + 2007-11-22 Tobias Burnus <burnus@net-b.de> PR fortran/34079 diff --git a/gcc/testsuite/g++.dg/ext/visibility/anon7.C b/gcc/testsuite/g++.dg/ext/visibility/anon7.C new file mode 100644 index 0000000..23a915b --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/visibility/anon7.C @@ -0,0 +1,23 @@ +// PR c++/34094 +// { dg-do compile } + +namespace +{ + struct A { + static int bar (); + static int i; // { dg-error "used, but not defined" } + static int j; + static int k; + static int l; + static const int m = 16; + static const int n = 17; + }; + int A::j = 4; + int A::k; + const int A::m; +} + +int foo (void) +{ + return A::i + A::j + A::k + A::m + A::n + A::bar (); +} |