public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-8172] c++: using in diagnostics [PR102987]
@ 2022-04-15 1:00 Jason Merrill
0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2022-04-15 1:00 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:6364a39907bd68624a30df0c8e380c40d2a646c4
commit r12-8172-g6364a39907bd68624a30df0c8e380c40d2a646c4
Author: Jason Merrill <jason@redhat.com>
Date: Thu Apr 14 17:35:35 2022 -0400
c++: using in diagnostics [PR102987]
The expression pretty-printing code crashed on a location wrapper with no
type, and didn't know what to do with a USING_DECL.
PR c++/102987
gcc/cp/ChangeLog:
* error.cc (dump_expr): Handle USING_DECL.
[VIEW_CONVERT_EXPR]: Just look through location wrapper.
gcc/testsuite/ChangeLog:
* g++.dg/diagnostic/using1.C: New test.
Diff:
---
gcc/cp/error.cc | 8 ++++++++
gcc/testsuite/g++.dg/diagnostic/using1.C | 16 ++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc
index e76842e1a2a..1e944ca3f75 100644
--- a/gcc/cp/error.cc
+++ b/gcc/cp/error.cc
@@ -2203,6 +2203,7 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
case WILDCARD_DECL:
case OVERLOAD:
case TYPE_DECL:
+ case USING_DECL:
case IDENTIFIER_NODE:
dump_decl (pp, t, ((flags & ~(TFF_DECL_SPECIFIERS|TFF_RETURN_TYPE
|TFF_TEMPLATE_HEADER))
@@ -2584,6 +2585,13 @@ dump_expr (cxx_pretty_printer *pp, tree t, int flags)
case VIEW_CONVERT_EXPR:
{
tree op = TREE_OPERAND (t, 0);
+
+ if (location_wrapper_p (t))
+ {
+ dump_expr (pp, op, flags);
+ break;
+ }
+
tree ttype = TREE_TYPE (t);
tree optype = TREE_TYPE (op);
diff --git a/gcc/testsuite/g++.dg/diagnostic/using1.C b/gcc/testsuite/g++.dg/diagnostic/using1.C
new file mode 100644
index 00000000000..eb4f18d1d8b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/using1.C
@@ -0,0 +1,16 @@
+// PR c++/102987
+// { dg-do compile { target c++11 } }
+
+struct a {
+ bool b();
+};
+template <typename c> struct d : c {
+ using c::e;
+ using f = d;
+ constexpr int g(decltype(e.b())) { return buh; } // { dg-error "buh" }
+};
+struct h {
+ a e;
+};
+using i = d<h>;
+auto j = i{}.g(1);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-15 1:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-15 1:00 [gcc r12-8172] c++: using in diagnostics [PR102987] Jason Merrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).