re PR c++/34094 (Undefined static data member in anonymous namespace can acquire...

	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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a8025f23820b243f5eb9244259a60dab961071ed..ae3cc0252e0d08c873158eca7f381d5723a87b82 100644 (file)
--- 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 d3ca1178950294012276bc06e8f5b71282755802..bf3d5981d222bcf9ed5a3af82127388edbd05407 100644 (file)
--- 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 7380eb89bb7b450fd8aa70d92260f1e480a0d6ae..ccd81e904c94b6264fcd59ff29d70573d6be1cfb 100644 (file)
--- 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 (file)
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 ();
+}