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 5BB6138708EC; Tue, 22 Dec 2020 02:17:38 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BB6138708EC
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug c++/67343] C++ mangler does not follow ABI for local names in
 expressions
Date: Tue, 22 Dec 2020 02:17:38 +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: 5.0
X-Bugzilla-Keywords: ABI, wrong-code
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: ASSIGNED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: jason at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-67343-4-BSY3qcPQg4@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-67343-4@http.gcc.gnu.org/bugzilla/>
References: <bug-67343-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: Tue, 22 Dec 2020 02:17:38 -0000

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

--- Comment #6 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jason Merrill <jason@gcc.gnu.org>:

https://gcc.gnu.org/g:58fb912c15175f4444144b8a4ab52a4880b84994

commit r11-6300-g58fb912c15175f4444144b8a4ab52a4880b84994
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Dec 21 17:36:25 2020 -0500

    c++: Fix demangling of <unresolved-name>

    The ABI for unresolved scoped names on the RHS of . and -> used to be

      sr <type> <unqualified-id>

    That changed years ago to something more complex, but G++ was never
updated.
    This change was particularly incompatible for simple qualified-ids like
    A::x, which were previously mangled as sr1A1x, and now sr1AE1x.

    This obviously makes life hard for demanglers, which can't know whether=
 to
    consume that E or not.  To work around this, we now try demangling with=
 the
    newer ABI, and if that fails and we saw an "sr", try again with the old=
er
    ABI.

    libiberty/ChangeLog:

            PR c++/67343
            * cp-demangle.h (struct d_info): Add unresolved_name_state.
            * cp-demangle.c (d_prefix): Add subst parm.
            (d_nested_name): Pass it.
            (d_unresolved_name): Split out from...
            (d_expression_1): ...here.
            (d_demangle_callback): Maybe retry with old sr mangling.
            * testsuite/demangle-expected: Add test.=