From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 524403858417; Tue, 28 Mar 2023 23:35:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 524403858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680046531; bh=vOjYvKK6o16DiNEXihPf+1cLPDW9/HpyREmgt2/kmtU=; h=From:To:Subject:Date:From; b=vcpPxN7dqmdf4+BLF7vgiLrLQYqzhgiZqLXzxnXAynYVZApAOFQmj4EKMll5X1lci HJhtEzeyATfqHCyqOnqPiXuguCFUy8TFyZGW9uFMdOUvwPtKZkI2p+z+bEScZOqCGE ti/Zj28FAj9mEAWmH7MhD7tiDelZYyypQljt+MuI= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-9349] libstdc++: Deliver names of C functions in X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Bj=C3=B6rn_Sch=C3=A4pers?= X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: f6c6df050a3e04744f81a471a53864ee2291ef4a X-Git-Newrev: b1f0c065022784680044d30fa269025ae44b43de Message-Id: <20230328233531.524403858417@sourceware.org> Date: Tue, 28 Mar 2023 23:35:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b1f0c065022784680044d30fa269025ae44b43de commit r12-9349-gb1f0c065022784680044d30fa269025ae44b43de Author: Björn Schäpers Date: Tue Dec 13 22:02:47 2022 +0100 libstdc++: Deliver names of C functions in __cxa_demangle is only to demangle C++ names, for all C functions, extern "C" functions, and including main it returns -2, in that case just adapt the given name. Otherwise it's kept empty, which doesn't look nice in the stacktrace. libstdc++-v3/ChangeLog: * include/std/stacktrace (stacktrace_entry::_S_demangle): Use raw __name if __cxa_demangle could not demangle it. Signed-off-by: Björn Schäpers (cherry picked from commit b1c839be8353edfb1951454be3c5a8150f771385) Diff: --- libstdc++-v3/include/std/stacktrace | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/include/std/stacktrace b/libstdc++-v3/include/std/stacktrace index a7fee8531f7..d46c05b3cd9 100644 --- a/libstdc++-v3/include/std/stacktrace +++ b/libstdc++-v3/include/std/stacktrace @@ -213,6 +213,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION &__status); if (__status == 0) __s = __str; + else + __s = __name; __builtin_free(__str); return __s; }