diff options
author | Alexandre Oliva <aoliva@redhat.com> | 2019-01-17 07:32:16 +0000 |
---|---|---|
committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2019-01-17 07:32:16 +0000 |
commit | 33f746e5585fb4da99cded09a44efd49ef2f22c7 (patch) | |
tree | c288da29f73644c8455d8be816191d34f7524634 /gcc/cp/cxx-pretty-print.c | |
parent | b25a37564938313a6deed3b6518d03552431c160 (diff) | |
download | gcc-33f746e5585fb4da99cded09a44efd49ef2f22c7.zip gcc-33f746e5585fb4da99cded09a44efd49ef2f22c7.tar.gz gcc-33f746e5585fb4da99cded09a44efd49ef2f22c7.tar.bz2 |
[PR86648] use auto identifier for class placeholder templates
dwarf2out recognizes unspecified auto types by the identifier. C++
template class placeholders are unspecified auto types that take the
identifier of the class rather than those used by preexisting auto
types, so dwarf2out ICEs when it finds one of those. Alas, they may
be visible to dwarf2out, since the types of e.g. static data members
of templates are only deduced at member instantiation, i.e., if the
data member is actually referenced, but the data member is added as a
field, still with unspecified auto placeholder type, when the
enclosing class is instantiated.
I've changed placeholder creator to use an auto identifier instead,
which allowed dropping the placeholder test in C++'s is_auto (alas, it
can't be used in dwarf2out, think LTO). To avoid losing information
in error messages and dumps and whatnot, I've added code to recognize
placeholders for template classes say A and print them out as
A<...auto...>.
for gcc/cp/ChangeLog
PR c++/86648
* pt.c (make_template_placeholder): Use auto_identifier.
(is_auto): Drop CLASS_PLACEHOLDER_TEMPLATE test.
* error.c (dump_type): Handle template placeholders.
* cxx-pretty-print.c (pp_cx_unqualified_id): Likewise.
for gcc/testsuite/ChangeLog
PR c++/86648
* gcc.dg/cpp1z/pr86648.C: New.
From-SVN: r268005
Diffstat (limited to 'gcc/cp/cxx-pretty-print.c')
-rw-r--r-- | gcc/cp/cxx-pretty-print.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 47eebd1..a114d66 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -187,7 +187,13 @@ pp_cxx_unqualified_id (cxx_pretty_printer *pp, tree t) case TEMPLATE_TYPE_PARM: case TEMPLATE_TEMPLATE_PARM: - if (TYPE_IDENTIFIER (t)) + if (template_placeholder_p (t)) + { + t = TREE_TYPE (CLASS_PLACEHOLDER_TEMPLATE (t)); + pp_cxx_unqualified_id (pp, TYPE_IDENTIFIER (t)); + pp_string (pp, "<...auto...>"); + } + else if (TYPE_IDENTIFIER (t)) pp_cxx_unqualified_id (pp, TYPE_IDENTIFIER (t)); else pp_cxx_canonical_template_parameter (pp, t); |