From: "Simon Martin" <simon@nasilyan.com>
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] c++: Handle erroneous DECL_LOCAL_DECL_ALIAS in duplicate_decls [PR107575]
Date: Wed, 5 Jun 2024 08:25:12 +0000 [thread overview]
Message-ID: <0102018fe7808bda-07f0ef0f-d458-4574-8e84-772c3eb098e5-000000@eu-west-1.amazonses.com> (raw)
In-Reply-To: <0102018fe7759751-88e2bb17-ead4-4cf0-a199-fa6231f73b49-000000@eu-west-1.amazonses.com>
[-- Attachment #1: Type: text/plain, Size: 2562 bytes --]
Hi,
There was a formatting error, corrected in the updated attached patch
:-/
On 5 Jun 2024, at 10:13, Simon Martin wrote:
> We currently ICE upon the following because we don't properly handle
> local
> functions with an error_mark_node as DECL_LOCAL_DECL_ALIAS in
> duplicate_decls.
>
> === cut here ===
> void f (void) {
> virtual int f (void) const;
> virtual int f (void);
> }
> === cut here ===
>
> This patch fixes this by checking for error_mark_node.
>
> Successfully tested on x86_64-pc-linux-gnu.
>
> PR c++/107575
>
> gcc/cp/ChangeLog:
>
> * decl.cc (duplicate_decls): Check for error_mark_node
> DECL_LOCAL_DECL_ALIAS.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/parse/crash74.C: New test.
>
> ---
> gcc/cp/decl.cc | 11 +++++++----
> gcc/testsuite/g++.dg/parse/crash74.C | 11 +++++++++++
> 2 files changed, 18 insertions(+), 4 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/parse/crash74.C
>
> diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
> index d481e1ec074..2ae46143d70 100644
> --- a/gcc/cp/decl.cc
> +++ b/gcc/cp/decl.cc
> @@ -2792,10 +2792,13 @@ duplicate_decls (tree newdecl, tree olddecl,
> bool hiding, bool was_hidden)
> retrofit_lang_decl (newdecl);
> tree alias = DECL_LOCAL_DECL_ALIAS (newdecl)
> = DECL_LOCAL_DECL_ALIAS (olddecl);
> - DECL_ATTRIBUTES (alias)
> - = (*targetm.merge_decl_attributes) (alias, newdecl);
> - if (TREE_CODE (newdecl) == FUNCTION_DECL)
> - merge_attribute_bits (newdecl, alias);
> + if (alias != error_mark_node)
> + {
> + DECL_ATTRIBUTES (alias) =
The = sign should have been on the next line; this is the case in the
updated patch.
> + (*targetm.merge_decl_attributes) (alias, newdecl);
> + if (TREE_CODE (newdecl) == FUNCTION_DECL)
> + merge_attribute_bits (newdecl, alias);
> + }
> }
> }
>
> diff --git a/gcc/testsuite/g++.dg/parse/crash74.C
> b/gcc/testsuite/g++.dg/parse/crash74.C
> new file mode 100644
> index 00000000000..a7ba5094be6
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/parse/crash74.C
> @@ -0,0 +1,11 @@
> +// PR c++/107575
> +
> +void f (void) {
> + virtual int f (void) const; // { dg-line line_4 }
> + virtual int f (void); // { dg-line line_5 }
> +}
> +
> +// { dg-error "outside class declaration" {} { target *-*-* } line_4
> }
> +// { dg-error "cannot have cv-qualifier" {} { target *-*-* } line_4 }
> +// { dg-error "ambiguating new declaration of" {} { target *-*-* }
> line_4 }
> +// { dg-error "outside class declaration" {} { target *-*-* } line_5
> }
> --
> 2.44.0
[-- Attachment #2: 0001-c-Handle-erroneous-DECL_LOCAL_DECL_ALIAS-in-duplicat.patch --]
[-- Type: text/plain, Size: 2514 bytes --]
From e75602d3ce998307749e5022d989b564a6d19703 Mon Sep 17 00:00:00 2001
From: Simon Martin <simon@nasilyan.com>
Date: Tue, 4 Jun 2024 21:20:23 +0200
Subject: [PATCH] c++: Handle erroneous DECL_LOCAL_DECL_ALIAS in duplicate_decls [PR107575]
We currently ICE upon the following because we don't properly handle local
functions with an error_mark_node as DECL_LOCAL_DECL_ALIAS in duplicate_decls.
=== cut here ===
void f (void) {
virtual int f (void) const;
virtual int f (void);
}
=== cut here ===
This patch fixes this by checking for error_mark_node.
Successfully tested on x86_64-pc-linux-gnu.
PR c++/107575
gcc/cp/ChangeLog:
* decl.cc (duplicate_decls): Check for error_mark_node
DECL_LOCAL_DECL_ALIAS.
gcc/testsuite/ChangeLog:
* g++.dg/parse/crash74.C: New test.
---
gcc/cp/decl.cc | 11 +++++++----
gcc/testsuite/g++.dg/parse/crash74.C | 11 +++++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/parse/crash74.C
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index d481e1ec074..03deb1493a4 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -2792,10 +2792,13 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
retrofit_lang_decl (newdecl);
tree alias = DECL_LOCAL_DECL_ALIAS (newdecl)
= DECL_LOCAL_DECL_ALIAS (olddecl);
- DECL_ATTRIBUTES (alias)
- = (*targetm.merge_decl_attributes) (alias, newdecl);
- if (TREE_CODE (newdecl) == FUNCTION_DECL)
- merge_attribute_bits (newdecl, alias);
+ if (alias != error_mark_node)
+ {
+ DECL_ATTRIBUTES (alias)
+ = (*targetm.merge_decl_attributes) (alias, newdecl);
+ if (TREE_CODE (newdecl) == FUNCTION_DECL)
+ merge_attribute_bits (newdecl, alias);
+ }
}
}
diff --git a/gcc/testsuite/g++.dg/parse/crash74.C b/gcc/testsuite/g++.dg/parse/crash74.C
new file mode 100644
index 00000000000..a7ba5094be6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash74.C
@@ -0,0 +1,11 @@
+// PR c++/107575
+
+void f (void) {
+ virtual int f (void) const; // { dg-line line_4 }
+ virtual int f (void); // { dg-line line_5 }
+}
+
+// { dg-error "outside class declaration" {} { target *-*-* } line_4 }
+// { dg-error "cannot have cv-qualifier" {} { target *-*-* } line_4 }
+// { dg-error "ambiguating new declaration of" {} { target *-*-* } line_4 }
+// { dg-error "outside class declaration" {} { target *-*-* } line_5 }
--
2.44.0
next prev parent reply other threads:[~2024-06-05 8:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240605081311.97544-1-simon@nasilyan.com>
2024-06-05 8:13 ` Simon Martin
[not found] ` <9463D268-EDE6-4910-B5A0-5A241267E774@nasilyan.com>
2024-06-05 8:25 ` Simon Martin [this message]
2024-06-05 8:34 ` Jakub Jelinek
[not found] ` <C1F84795-035D-44E4-A5CD-E526C8CA026A@nasilyan.com>
2024-06-05 9:20 ` Simon Martin
2024-06-07 17:32 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0102018fe7808bda-07f0ef0f-d458-4574-8e84-772c3eb098e5-000000@eu-west-1.amazonses.com \
--to=simon@nasilyan.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).