diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-08 12:30:25 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-08 12:30:25 -0500 |
| commit | 2c86a82aa431b1fc370290103a95c67bc8602473 (patch) | |
| tree | 69a73603abcfe461311bfebcdc466e9db1d5bb29 | |
| parent | 530a480063ae847a74add404586d5db4ed9bf8a8 (diff) | |
| download | gcc-2c86a82aa431b1fc370290103a95c67bc8602473.zip gcc-2c86a82aa431b1fc370290103a95c67bc8602473.tar.gz gcc-2c86a82aa431b1fc370290103a95c67bc8602473.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/anon5.C | 6 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 883175a..319bdf3 100644 --- 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 076224c..48f9382 100644 --- 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 d9297fe..28caa91 100644 --- 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 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>) {} |