From: Matthias Kretz <m.kretz@gsi.de>
To: <gcc-patches@gcc.gnu.org>
Subject: [PATCH] c++: don't ICE on NAMESPACE_DECL inside FUNCTION_DECL
Date: Wed, 15 Dec 2021 09:53:46 +0100 [thread overview]
Message-ID: <6912302.kQq0lBPeGt@excalibur> (raw)
[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]
OK for trunk? This fixes several modules.exp failures for me.
────────────────────── ✂ ──────────────────────
Code like
void swap() {
namespace __variant = __detail::__variant;
...
}
create a NAMESPACE_DECL where the CP_DECL_CONTEXT is a FUNCTION_DECL.
DECL_TEMPLATE_INFO fails on NAMESPACE_DECL and therefore must be handled
first in the assertion.
Signed-off-by: Matthias Kretz <m.kretz@gsi.de>
gcc/cp/ChangeLog:
* module.cc (trees_out::get_merge_kind): NAMESPACE_DECLs also
cannot have a DECL_TEMPLATE_INFO.
---
gcc/cp/module.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
──────────────────────────────────────────────────────────────────────────
Dr. Matthias Kretz https://mattkretz.github.io
GSI Helmholtz Centre for Heavy Ion Research https://gsi.de
stdₓ::simd
──────────────────────────────────────────────────────────────────────────
[-- Attachment #2: 0001-c-don-t-assert-on-NAMESPACE_DECL-inside-FUNCTION_DEC.patch --]
[-- Type: text/x-patch, Size: 721 bytes --]
diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 3b1b5ca0ac0..2b5a32695d2 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -10067,9 +10067,10 @@ trees_out::get_merge_kind (tree decl, depset *dep)
tree ctx = CP_DECL_CONTEXT (decl);
if (TREE_CODE (ctx) == FUNCTION_DECL)
{
- /* USING_DECLs cannot have DECL_TEMPLATE_INFO -- this isn't
- permitting them to have one. */
+ /* USING_DECLs and NAMESPACE_DECLs cannot have DECL_TEMPLATE_INFO --
+ this isn't permitting them to have one. */
gcc_checking_assert (TREE_CODE (decl) == USING_DECL
+ || TREE_CODE (decl) == NAMESPACE_DECL
|| !DECL_LANG_SPECIFIC (decl)
|| !DECL_TEMPLATE_INFO (decl));
next reply other threads:[~2021-12-15 8:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 8:53 Matthias Kretz [this message]
2021-12-17 20:54 ` 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=6912302.kQq0lBPeGt@excalibur \
--to=m.kretz@gsi.de \
--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).