]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR c++/45651 (ICE in import_export_decl, at cp/decl2.c:2344)
authorJason Merrill <jason@redhat.com>
Wed, 9 Mar 2011 01:28:19 +0000 (20:28 -0500)
committerJason Merrill <jason@gcc.gnu.org>
Wed, 9 Mar 2011 01:28:19 +0000 (20:28 -0500)
PR c++/45651
* pt.c (instantiate_decl): Don't clear DECL_INTERFACE_KNOWN on
!TREE_PUBLIC decls.

From-SVN: r170806

gcc/cp/ChangeLog
gcc/cp/pt.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/template/anon5.C [new file with mode: 0644]

index 6c341f37d254ef4b47e59a379bab82dd5daa87a2..a35d9e9bc278f2ae9f3a8771cfa01f5767caa218 100644 (file)
@@ -1,3 +1,9 @@
+2011-03-08  Jason Merrill  <jason@redhat.com>
+
+       PR c++/45651
+       * pt.c (instantiate_decl): Don't clear DECL_INTERFACE_KNOWN on
+       !TREE_PUBLIC decls.
+
 2011-03-08  Jason Merrill  <jason@redhat.com>
 
        PR c++/47289
index 77d2f87f980ffd947160f78b35f7509c0dab9080..716a7c568e12be792cb1ff71658c7b25ed097241 100644 (file)
@@ -16721,8 +16721,13 @@ instantiate_decl (tree d, int defer_ok,
   if (!pattern_defined && expl_inst_class_mem_p
       && DECL_EXPLICIT_INSTANTIATION (d))
     {
-      DECL_NOT_REALLY_EXTERN (d) = 0;
-      DECL_INTERFACE_KNOWN (d) = 0;
+      /* Leave linkage flags alone on instantiations with anonymous
+        visibility.  */
+      if (TREE_PUBLIC (d))
+       {
+         DECL_NOT_REALLY_EXTERN (d) = 0;
+         DECL_INTERFACE_KNOWN (d) = 0;
+       }
       SET_DECL_IMPLICIT_INSTANTIATION (d);
     }
 
index 9f5fa1ddb734ef86c119d8b275224a0290b8354e..6e09fa368a5b160a8a7e2cc8142603e36bd172ee 100644 (file)
@@ -1,3 +1,7 @@
+2011-03-08  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/template/anon5.C: New.
+
 2011-03-08  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/cpp0x/variadic105.C: New.
diff --git a/gcc/testsuite/g++.dg/template/anon5.C b/gcc/testsuite/g++.dg/template/anon5.C
new file mode 100644 (file)
index 0000000..34599c0
--- /dev/null
@@ -0,0 +1,6 @@
+// PR c++/45651
+
+namespace { template <int T> struct A {}; }
+template <int T> struct B { void f(A<T>); };
+template struct B<1>;
+template<int T> void B<T>::f(A<T>) {}