* [PATCH] c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers
@ 2024-04-20 8:38 Nathaniel Shead
2024-04-22 2:59 ` Patrick Palka
0 siblings, 1 reply; 3+ messages in thread
From: Nathaniel Shead @ 2024-04-20 8:38 UTC (permalink / raw)
To: gcc-patches; +Cc: Jason Merrill
Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk?
-- >8 --
This fixes a null dereference issue when decl_specifiers.type is not yet
provided.
gcc/cp/ChangeLog:
* parser.cc (cp_parser_parameter_declaration): Check if
decl_specifiers.type is null.
gcc/testsuite/ChangeLog:
* g++.dg/cpp23/explicit-obj-basic7.C: New test.
Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
---
gcc/cp/parser.cc | 5 +++--
gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C | 9 +++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 50d3ad35b61..97ee2650dc4 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -25780,8 +25780,9 @@ cp_parser_parameter_declaration (cp_parser *parser,
}
if (xobj_param_p
- && (declarator ? declarator->parameter_pack_p
- : PACK_EXPANSION_P (decl_specifiers.type)))
+ && ((declarator && declarator->parameter_pack_p)
+ || (decl_specifiers.type
+ && PACK_EXPANSION_P (decl_specifiers.type))))
{
location_t xobj_param
= make_location (decl_specifiers.locations[ds_this],
diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C
new file mode 100644
index 00000000000..a474e97fc18
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C
@@ -0,0 +1,9 @@
+// { dg-do compile { target c++23 } }
+
+// Shouldn't ICE
+struct S {
+ void a(this long);
+ void b(this const long);
+ void c(this long unsigned);
+ void c(this signed);
+};
--
2.43.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers
2024-04-20 8:38 [PATCH] c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers Nathaniel Shead
@ 2024-04-22 2:59 ` Patrick Palka
2024-04-23 14:39 ` Jason Merrill
0 siblings, 1 reply; 3+ messages in thread
From: Patrick Palka @ 2024-04-22 2:59 UTC (permalink / raw)
To: Nathaniel Shead; +Cc: gcc-patches, Jason Merrill
> Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk?
>
> -- >8 --
>
> This fixes a null dereference issue when decl_specifiers.type is not yet
> provided.
>
> gcc/cp/ChangeLog:
>
> * parser.cc (cp_parser_parameter_declaration): Check if
> decl_specifiers.type is null.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/cpp23/explicit-obj-basic7.C: New test.
LGTM
>
> Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
> ---
> gcc/cp/parser.cc | 5 +++--
> gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C | 9 +++++++++
> 2 files changed, 12 insertions(+), 2 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C
>
> diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
> index 50d3ad35b61..97ee2650dc4 100644
> --- a/gcc/cp/parser.cc
> +++ b/gcc/cp/parser.cc
> @@ -25780,8 +25780,9 @@ cp_parser_parameter_declaration (cp_parser *parser,
> }
>
> if (xobj_param_p
> - && (declarator ? declarator->parameter_pack_p
> - : PACK_EXPANSION_P (decl_specifiers.type)))
> + && ((declarator && declarator->parameter_pack_p)
> + || (decl_specifiers.type
> + && PACK_EXPANSION_P (decl_specifiers.type))))
> {
> location_t xobj_param
> = make_location (decl_specifiers.locations[ds_this],
> diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C
> new file mode 100644
> index 00000000000..a474e97fc18
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C
> @@ -0,0 +1,9 @@
> +// { dg-do compile { target c++23 } }
> +
> +// Shouldn't ICE
> +struct S {
> + void a(this long);
> + void b(this const long);
> + void c(this long unsigned);
> + void c(this signed);
> +};
> --
> 2.43.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers
2024-04-22 2:59 ` Patrick Palka
@ 2024-04-23 14:39 ` Jason Merrill
0 siblings, 0 replies; 3+ messages in thread
From: Jason Merrill @ 2024-04-23 14:39 UTC (permalink / raw)
To: Patrick Palka, Nathaniel Shead; +Cc: gcc-patches
On 4/21/24 19:59, Patrick Palka wrote:
>> Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk?
>>
>> -- >8 --
>>
>> This fixes a null dereference issue when decl_specifiers.type is not yet
>> provided.
>>
>> gcc/cp/ChangeLog:
>>
>> * parser.cc (cp_parser_parameter_declaration): Check if
>> decl_specifiers.type is null.
>>
>> gcc/testsuite/ChangeLog:
>>
>> * g++.dg/cpp23/explicit-obj-basic7.C: New test.
>
> LGTM
Yes, OK.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-23 14:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-20 8:38 [PATCH] c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers Nathaniel Shead
2024-04-22 2:59 ` Patrick Palka
2024-04-23 14:39 ` 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).