diff options
| author | Jason Merrill <jason@redhat.com> | 2021-04-07 15:38:07 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2021-04-07 17:01:36 -0400 |
| commit | b40d45cb1930e9aa8a1f9a6a8728fd47ebeeaaac (patch) | |
| tree | f7722a156fee463dc61872c9b98a53ad94355356 | |
| parent | a528594cf9a74e5a0fbac13ef673064ed73e1b89 (diff) | |
| download | gcc-b40d45cb1930e9aa8a1f9a6a8728fd47ebeeaaac.zip gcc-b40d45cb1930e9aa8a1f9a6a8728fd47ebeeaaac.tar.gz gcc-b40d45cb1930e9aa8a1f9a6a8728fd47ebeeaaac.tar.bz2 | |
c++: base template friend [PR52625]
Here we were mistakenly treating the injected-class-name as a partial
specialization.
gcc/cp/ChangeLog:
PR c++/52625
* pt.c (maybe_process_partial_specialization): Check
DECL_SELF_REFERENCE_P.
gcc/testsuite/ChangeLog:
PR c++/52625
* g++.dg/template/friend70.C: New test.
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/friend70.C | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a08d08d..dee8021 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -984,6 +984,10 @@ maybe_process_partial_specialization (tree type) if (CLASS_TYPE_P (type) && CLASSTYPE_LAMBDA_EXPR (type)) return type; + /* An injected-class-name is not a specialization. */ + if (DECL_SELF_REFERENCE_P (TYPE_NAME (type))) + return type; + if (TREE_CODE (type) == BOUND_TEMPLATE_TEMPLATE_PARM) { error ("name of class shadows template template parameter %qD", diff --git a/gcc/testsuite/g++.dg/template/friend70.C b/gcc/testsuite/g++.dg/template/friend70.C new file mode 100644 index 0000000..5496548 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend70.C @@ -0,0 +1,9 @@ +// PR c++/52625 + +template<class> +class base {}; + +class derived : public base<derived> +{ + template<class> friend class base; +}; |