From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 56C62384DD90 for ; Mon, 12 Dec 2022 21:35:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 56C62384DD90 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x42b.google.com with SMTP id h16so4680833wrz.12 for ; Mon, 12 Dec 2022 13:35:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=8ArAbmMS0Hf5sKaJtxKX4GKUO+e7/R8bXQDyF3Ox6UU=; b=CrOB5P7LGLNhJTML87lv031rw+TJgcS6b0MHkLvQUKD3wJZLflPUNSKYbBP8r3v3UW 7siiA3x2PxNMX4eSdkc6Vau1dV1ReXP1rl3TVNUCgtuW4w6oF310DHfHV4DQqdvXN65w ZqpsvjrqN3yfpuywfew8UWfQXffUsD41QOwygD0dXo0WJHJNbXphBwwbakWDHrkuIP17 TktsKrc93YQms9bJrZO+1wZSS0xahkxiVzW0fWsIKNvMtFf2y3VhYywJXBemDyCKyw+M QwyqZm629Mj/wlYmzy3X84agafFbJrc8HRoNK2ZEh92zqEheS1uEfnpmFCcDu4/Ggl0M Qn2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8ArAbmMS0Hf5sKaJtxKX4GKUO+e7/R8bXQDyF3Ox6UU=; b=O/cKqes4LMQy3wL2+U27V0yp0MgGvADlWk9MwbjNGtPJIQqQDknGB9L+7mTeAXKPXR f6jfGU/zQE9WVg02G+lzXIVBSq4sytSshHIp2PcLLOLT2gi04rWDS7kuy39hKY5zNrQR Ry2pP+2jzgVi7VNv4JcvTQypevj7QCFisesVV47H3noa5mL+Celsxcht1F/8H7RCBUkZ pxZaj8mJZLKySbuDLzhDTqOVJqgQ1Uf7QoBOQYaEonFt5NqWmvyv5rskpTeivNW3l+z3 m6it2spAcUKW7Cm+IMP7mKYr77J9jwfKBnx+R16F1SFDkE3b+N13oDZ12X0jcw+1UCTE qiWw== X-Gm-Message-State: ANoB5pnzQn8EYm4JeEdqgP86CDjU+ZI6kcJwqh2H0rr2sPOaanmftLFM 5A//cuyXvRFHAFXkJXO7AcuNHpPmnd8= X-Google-Smtp-Source: AA0mqf5Z8yqoMl6UpDBaT8S5fHLShI4k7AcjlCskvAhSruLxZMOD0fkn98639lylfEKM7CoJ31D/Cw== X-Received: by 2002:adf:ea8b:0:b0:242:4843:713a with SMTP id s11-20020adfea8b000000b002424843713amr11240580wrm.7.1670880916349; Mon, 12 Dec 2022 13:35:16 -0800 (PST) Received: from ?IPV6:2a01:e0a:1dc:b1c0:30d2:eb6e:1807:519d? ([2a01:e0a:1dc:b1c0:30d2:eb6e:1807:519d]) by smtp.googlemail.com with ESMTPSA id k4-20020a5d66c4000000b002365254ea42sm9876982wrw.1.2022.12.12.13.35.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Dec 2022 13:35:15 -0800 (PST) Message-ID: <7973b22e-791b-a61e-e354-3e6f02e5a731@gmail.com> Date: Mon, 12 Dec 2022 22:35:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH] libstdc++: Deliver names of C functions in To: libstdc++@gcc.gnu.org References: <20221212175601.50166-1-gcc@hazardy.de> Content-Language: fr From: =?UTF-8?Q?Fran=c3=a7ois_Dumont?= In-Reply-To: <20221212175601.50166-1-gcc@hazardy.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 12/12/22 18:56, Björn Schäpers wrote: > From: Björn Schäpers > > One could add (), these are not part of __name. One could also try to > check upfront if __cxa_demangle should be called at all. > > -- >8 -- > > Tested on i686-w64-mingw32. > > __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 > --- > libstdc++-v3/include/std/stacktrace | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/libstdc++-v3/include/std/stacktrace b/libstdc++-v3/include/std/stacktrace > index 83c6463b0d8..6d4051b9f5b 100644 > --- a/libstdc++-v3/include/std/stacktrace > +++ b/libstdc++-v3/include/std/stacktrace > @@ -217,8 +217,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > int __status; > char* __str = __cxxabiv1::__cxa_demangle(__name, nullptr, nullptr, > &__status); > - if (__status == 0) > + switch (__status) > + { > + case 0: > __s = __str; > + break; > + case -2: > + __s = __name; > + break; > + } > __builtin_free(__str); > return __s; > } why not just using __name if __status != 0 ? Everything seems better than an empty string, no ? This is what I've done in src/c++11/debug.cc.