public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Nathaniel Shead <nshead@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r14-10100] c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers
Date: Tue, 23 Apr 2024 23:48:57 +0000 (GMT)	[thread overview]
Message-ID: <20240423234858.04626384AB71@sourceware.org> (raw)

https://gcc.gnu.org/g:7318f1a389769ab540f414fcba743e90051d466b

commit r14-10100-g7318f1a389769ab540f414fcba743e90051d466b
Author: Nathaniel Shead <nathanieloshead@gmail.com>
Date:   Sat Apr 20 14:44:11 2024 +1000

    c++: Fix ICE with xobj parms and maybe incomplete decl-specifiers
    
    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>

Diff:
---
 gcc/cp/parser.cc                                 | 5 +++--
 gcc/testsuite/g++.dg/cpp23/explicit-obj-basic7.C | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index c23758cf5cf..598380dda08 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);
+};

                 reply	other threads:[~2024-04-23 23:48 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20240423234858.04626384AB71@sourceware.org \
    --to=nshead@gcc.gnu.org \
    --cc=gcc-cvs@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).