re PR c++/69113 (ICE: in vague_linkage_p, at cp/decl2.c:1875 with -fno-weak)

	PR c++/69113
	* decl2.c (comdat_linkage): Only set DECL_COMDAT if TREE_PUBLIC is set.

	* g++.dg/pr69113.C: New test.

From-SVN: r232189

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3ec2e1c5bf9db298d8e96e6b51eea46b3d5e4f20..9aedf005547c7af1850ef497ce932d29a1657714 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-09  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/69113
+       * decl2.c (comdat_linkage): Only set DECL_COMDAT if TREE_PUBLIC is set.
+
 2016-01-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/69164

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 9a07e1e006f518ddc51449bc6e0c7c47d2eb7be6..a7212ca05bb65d95adfe1c2d1c2496ae3db3ca72 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1820,7 +1820,8 @@ comdat_linkage (tree decl)
        }
     }
 
-  DECL_COMDAT (decl) = 1;
+  if (TREE_PUBLIC (decl))
+    DECL_COMDAT (decl) = 1;
 }
 
 /* For win32 we also want to put explicit instantiations in

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 107ea24f396eb7bd14c91bdfc24827414590faaf..4af4374cea6b8eb103db375fd3e74c218e99dab7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-09  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/69113
+       * g++.dg/pr69113.C: New test.
+
 2016-01-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/50865

diff --git a/gcc/testsuite/g++.dg/pr69113.C b/gcc/testsuite/g++.dg/pr69113.C
new file mode 100644 (file)
index 0000000..2f8331e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr69113.C
@@ -0,0 +1,17 @@
+// PR c++/69113
+// { dg-do compile }
+// { dg-options "-fno-weak" }
+
+struct foo
+{
+  static void bar ()
+  {
+    struct baz
+    {
+      static void m ()
+      {
+       static int n;
+      }
+    };
+  }
+};