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 E8847384B060; Thu, 28 Jan 2021 12:57:44 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E8847384B060
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug c++/98770] [modules] including certain stdlib headers in the
 global module fragment of different modules causes conflicting global module
 declarations
Date: Thu, 28 Jan 2021 12:57:44 +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: 11.0
X-Bugzilla-Keywords: rejects-valid
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: nathan at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-98770-4-BznJ1fZe6K@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-98770-4@http.gcc.gnu.org/bugzilla/>
References: <bug-98770-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
X-BeenThere: gcc-bugs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-bugs mailing list <gcc-bugs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-bugs>,
 <mailto:gcc-bugs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-bugs/>
List-Post: <mailto:gcc-bugs@gcc.gnu.org>
List-Help: <mailto:gcc-bugs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-bugs>,
 <mailto:gcc-bugs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2021 12:57:45 -0000

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

--- Comment #1 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Nathan Sidwell <nathan@gcc.gnu.org>:

https://gcc.gnu.org/g:af66f4f1b06f5e0c099dfced2fcf7b1b23fa53e7

commit r11-6954-gaf66f4f1b06f5e0c099dfced2fcf7b1b23fa53e7
Author: Nathan Sidwell <nathan@acm.org>
Date:   Thu Jan 28 04:48:33 2021 -0800

    c++: header unit template alias merging [PR 98770]

    Typedefs are streamed by streaming the underlying type, and then
    recreating the typedef.  But this breaks checking a duplicate is the
    same as the original when it is a template alias -- we end up checking
    a template alias (eg __void_t) against the underlying type (void).
    And those are not the same template alias.  This stops pretendig that
    the underlying type is the typedef for that checking and tells
    is_matching_decl 'you have a typedef', so it knows what to do.  (We do
    not want to recreate the typedef of the duplicate, because that whole
    set of nodes is going to go away.)

            PR c++/98770
            gcc/cp/
            * module.cc (trees_out::decl_value): Swap is_typedef & TYPE_NAME
            check order.
            (trees_in::decl_value): Do typedef frobbing only when installing
            a new typedef, adjust is_matching_decl call.  Swap is_typedef
            & TYPE_NAME check.
            (trees_in::is_matching_decl): Add is_typedef parm. Adjust varia=
ble
            names and deal with typedef checking.
            gcc/testsuite/
            * g++.dg/modules/pr98770_a.C: New.
            * g++.dg/modules/pr98770_b.C: New.=