re PR c++/45651 (ICE in import_export_decl, at cp/decl2.c:2344)

	PR c++/45651
	* pt.c (instantiate_decl): Don't clear DECL_INTERFACE_KNOWN on
	!TREE_PUBLIC decls.

From-SVN: r170781

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 883175a8e33ff7ba49be7ae16b2024b90232b9e0..319bdf3d7a35997dc26a966f118cddf919210ddf 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/47957

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 076224c46df64d4b29b2bee5be876e39007969ec..48f938222747744e6f4a884b4061243fd8713fd5 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -17224,8 +17224,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);
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d9297febc4f6ada0153d5d3c63c6a22165c476e2..28caa917a7240ee52cb14bb9171a0f4903e193d7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-08  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/template/anon5.C: New.
+
 2011-03-08  Jakub Jelinek  <jakub@redhat.com>
 
        PR debug/47881

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
+++ b/gcc/testsuite/g++.dg/template/anon5.C
@@ -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>) {}