diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-08-21 13:29:20 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-08-21 13:29:20 +0000 |
| commit | 5ec1701eae7178a140be621ac5aec4e40c1070b5 (patch) | |
| tree | 5b5c0f1de8e36966acd24979e346a453fdebc2d6 | |
| parent | 404938eda1ea3f5dcbca089aa7b23dc04f75b9e0 (diff) | |
| download | gcc-5ec1701eae7178a140be621ac5aec4e40c1070b5.zip gcc-5ec1701eae7178a140be621ac5aec4e40c1070b5.tar.gz gcc-5ec1701eae7178a140be621ac5aec4e40c1070b5.tar.bz2 | |
re PR c++/81899 (ICE: Segmentation fault)
PR c++/81899
* pt.c (instantiate_class_template_1):
BOUND_TEMPLATE_TEMPLATE_PARM is never friend-injected.
PR c++/81899
* g++.dg/template/pr81899.C: New.
From-SVN: r251227
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/pr81899.C | 11 |
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 72a05547..ba9583a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-08-21 Nathan Sidwell <nathan@acm.org> + + PR c++/81899 + * pt.c (instantiate_class_template_1): + BOUND_TEMPLATE_TEMPLATE_PARM is never friend-injected. + 2017-08-18 David Malcolm <dmalcolm@redhat.com> PR c++/81514 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bf1f75d..8d816c7 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10724,7 +10724,8 @@ instantiate_class_template_1 (tree type) adjust_processing_template_decl = true; --processing_template_decl; } - else if (!CLASSTYPE_USE_TEMPLATE (friend_type) + else if (TREE_CODE (friend_type) != BOUND_TEMPLATE_TEMPLATE_PARM + && !CLASSTYPE_USE_TEMPLATE (friend_type) && TYPE_HIDDEN_P (friend_type)) { /* friend class C; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 53505ef..f35db2b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-08-21 Nathan Sidwell <nathan@acm.org> + + PR c++/81899 + * g++.dg/template/pr81899.C: New. + 2017-08-21 Richard Biener <rguenther@suse.de> PR tree-optimization/81900 diff --git a/gcc/testsuite/g++.dg/template/pr81899.C b/gcc/testsuite/g++.dg/template/pr81899.C new file mode 100644 index 0000000..2db57cf --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pr81899.C @@ -0,0 +1,11 @@ +// PR 81899 we tried to treat a bound-tpl-tpl-parm as-if a real record-type + +template <template <typename> class FunctorData> +struct functor { + friend FunctorData<int>; + void foo(); +}; + +template <typename> struct data; + +template<> void functor<data>::foo(); |