From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 666F6385840D; Sun,  7 Jan 2024 10:52:16 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 666F6385840D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1704624736;
	bh=nisFut2YSoFXvj6yo9kYMxYnmtj5F/32nt4nq4bVdw8=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=D+ubcIPuc5taMJ+G7fRPVu4VwqtIEEkC0nOH15q1pbWD/nY0eMgUyQXHWhdexdkYH
	 E7d3S5f2ZKNp0+HIsMKe2ENZP64fArKLhc9fxgt8xyDRFB8BSZncqFw1HF75n2k0Ft
	 b1OAR4pkeL5qIlkGKOb4UOsllUoa0eElb4VGaYX4=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug c++/110808] [modules] Internal Compiler Error in
 check_mergeable_decl
Date: Sun, 07 Jan 2024 10:52:14 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: c++
X-Bugzilla-Version: 12.1.0
X-Bugzilla-Keywords: ice-on-valid-code
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: UNCONFIRMED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-110808-4-Zqem8aFRon@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-110808-4@http.gcc.gnu.org/bugzilla/>
References: <bug-110808-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D110808

--- Comment #2 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Nathaniel Shead <nshead@gcc.gnu.org>:

https://gcc.gnu.org/g:7f24446a3cf67d1346c78b4667fba74b73a23302

commit r14-6977-g7f24446a3cf67d1346c78b4667fba74b73a23302
Author: Nathaniel Shead <nathanieloshead@gmail.com>
Date:   Fri Nov 24 16:26:43 2023 +1100

    c++: Follow module grammar more closely [PR110808]

    This patch cleans up the parsing of module-declarations and
    import-declarations to more closely follow the grammar defined by the
    standard.

    For instance, currently we allow declarations like 'import A:B', even
    from an unrelated source file (not part of module A), which causes
    errors in merging declarations. However, the syntax in [module.import]
    doesn't even allow this form of import, so this patch prevents this from
    parsing at all and avoids the error that way.

    Additionally, we sometimes allow statements like 'import :X' or
    'module :X' even when not in a named module, and this causes segfaults,
    so we disallow this too.

            PR c++/110808

    gcc/cp/ChangeLog:

            * parser.cc (cp_parser_module_name): Rewrite to handle
            module-names and module-partitions independently.
            (cp_parser_module_partition): New function.
            (cp_parser_module_declaration): Parse module partitions
            explicitly. Don't change state if parsing module decl failed.
            (cp_parser_import_declaration): Handle different kinds of
            import-declarations locally.

    gcc/testsuite/ChangeLog:

            * g++.dg/modules/part-hdr-1_c.C: Fix syntax.
            * g++.dg/modules/part-mac-1_c.C: Likewise.
            * g++.dg/modules/mod-invalid-1.C: New test.
            * g++.dg/modules/part-8_a.C: New test.
            * g++.dg/modules/part-8_b.C: New test.
            * g++.dg/modules/part-8_c.C: New test.

    Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>=