* C++ PATCH to fix ICE with suggestions (PR c++/84537)
@ 2018-02-26 9:45 Marek Polacek
2018-02-26 14:08 ` Jason Merrill
0 siblings, 1 reply; 2+ messages in thread
From: Marek Polacek @ 2018-02-26 9:45 UTC (permalink / raw)
To: GCC Patches, Jason Merrill
Here error_mark_node leaks all the way to edit_distance_traits::get_string
which crashed, so let's not try to give a suggestion for an error node in
the first place.
Bootstrapped/regtested on x86_64-linux, ok for trunk?
2018-02-26 Marek Polacek <polacek@redhat.com>
PR c++/84537
* name-lookup.c (suggest_alternative_in_explicit_scope): Return false
if name is error node.
* g++.dg/parse/error60.C: New test.
diff --git gcc/cp/name-lookup.c gcc/cp/name-lookup.c
index 9117e0b30eb..0f00328e96e 100644
--- gcc/cp/name-lookup.c
+++ gcc/cp/name-lookup.c
@@ -5541,6 +5541,10 @@ bool
suggest_alternative_in_explicit_scope (location_t location, tree name,
tree scope)
{
+ /* Something went very wrong; don't suggest anything. */
+ if (name == error_mark_node)
+ return false;
+
/* Resolve any namespace aliases. */
scope = ORIGINAL_NAMESPACE (scope);
diff --git gcc/testsuite/g++.dg/parse/error60.C gcc/testsuite/g++.dg/parse/error60.C
index e69de29bb2d..38f4e34c59d 100644
--- gcc/testsuite/g++.dg/parse/error60.C
+++ gcc/testsuite/g++.dg/parse/error60.C
@@ -0,0 +1,9 @@
+// PR c++/84537
+// { dg-do compile }
+
+namespace N
+{
+ template<int> struct A {};
+}
+
+N::template A<> a; // { dg-error "" }
Marek
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: C++ PATCH to fix ICE with suggestions (PR c++/84537)
2018-02-26 9:45 C++ PATCH to fix ICE with suggestions (PR c++/84537) Marek Polacek
@ 2018-02-26 14:08 ` Jason Merrill
0 siblings, 0 replies; 2+ messages in thread
From: Jason Merrill @ 2018-02-26 14:08 UTC (permalink / raw)
To: Marek Polacek; +Cc: GCC Patches
OK.
On Mon, Feb 26, 2018 at 4:44 AM, Marek Polacek <polacek@redhat.com> wrote:
> Here error_mark_node leaks all the way to edit_distance_traits::get_string
> which crashed, so let's not try to give a suggestion for an error node in
> the first place.
>
> Bootstrapped/regtested on x86_64-linux, ok for trunk?
>
> 2018-02-26 Marek Polacek <polacek@redhat.com>
>
> PR c++/84537
> * name-lookup.c (suggest_alternative_in_explicit_scope): Return false
> if name is error node.
>
> * g++.dg/parse/error60.C: New test.
>
> diff --git gcc/cp/name-lookup.c gcc/cp/name-lookup.c
> index 9117e0b30eb..0f00328e96e 100644
> --- gcc/cp/name-lookup.c
> +++ gcc/cp/name-lookup.c
> @@ -5541,6 +5541,10 @@ bool
> suggest_alternative_in_explicit_scope (location_t location, tree name,
> tree scope)
> {
> + /* Something went very wrong; don't suggest anything. */
> + if (name == error_mark_node)
> + return false;
> +
> /* Resolve any namespace aliases. */
> scope = ORIGINAL_NAMESPACE (scope);
>
> diff --git gcc/testsuite/g++.dg/parse/error60.C gcc/testsuite/g++.dg/parse/error60.C
> index e69de29bb2d..38f4e34c59d 100644
> --- gcc/testsuite/g++.dg/parse/error60.C
> +++ gcc/testsuite/g++.dg/parse/error60.C
> @@ -0,0 +1,9 @@
> +// PR c++/84537
> +// { dg-do compile }
> +
> +namespace N
> +{
> + template<int> struct A {};
> +}
> +
> +N::template A<> a; // { dg-error "" }
>
> Marek
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-02-26 14:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-26 9:45 C++ PATCH to fix ICE with suggestions (PR c++/84537) Marek Polacek
2018-02-26 14:08 ` 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).