From patchwork Wed Jan 4 11:50:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 62699 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9E97F3858C60 for ; Wed, 4 Jan 2023 11:51:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9E97F3858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672833084; bh=A4qYl5t9ZZbyIv+7S2iyq4zeqoiUc4UlbUmJSWEodqk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=rPMWdM1zhA00qU2RNgSdk3gZ8eMhrLbxo6nakY+qD8HS8MYluBT8VCcXEveDkMzYm aS+KxfaVCdI3orygCPLDEBndAImKS9YBjk5UgGakS8vwo0HiVz2NYBdsK7kxHyzka5 4jBsTaOcgdGZAnZHFba3fubTg2OCv8RPsfukU06E= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id D4FB23858D1E for ; Wed, 4 Jan 2023 11:51:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4FB23858D1E Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-563--9sTb5mtPuSF5Rc5CsQcng-1; Wed, 04 Jan 2023 06:50:56 -0500 X-MC-Unique: -9sTb5mtPuSF5Rc5CsQcng-1 Received: by mail-wr1-f72.google.com with SMTP id i26-20020adfaada000000b0027c76c49445so2997817wrc.13 for ; Wed, 04 Jan 2023 03:50:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=A4qYl5t9ZZbyIv+7S2iyq4zeqoiUc4UlbUmJSWEodqk=; b=KiF8hR8QnuaUZpyLoMh+twIMhsrYt8WmmsHhgaT96UATp6IzudiJrttIdWOFRO9tDG nUsP0vko1ZEjOmqarMrlcFiTNK0mzMmylbptURdtxIwwnq07u9sAdj5nU+HxGDHOJoCw 2NRdrpV9eQNp3KWfLIf0GxTZvau5DuT/QYgdgMhNKXUXJc1dgaVMS3c6OhAaHA2YvnnR 1JfoBu4iiHt1LGtk2Q09iu1ljuIZpUTIdaV+z6Bq/HwdeFUPwpURpufMvICfpbMsw7As x7gOM54azdg4pkioo+yyyi63HVRKB/w67d/wxWM+7dkM40sr0vE47Lbso+zoHPW6nRf6 Y+Ig== X-Gm-Message-State: AFqh2krJepdOIQLd+JIZvt/qeFwIi73f1ApKgQ+tRxcMBm0OJ4qS/w8Q mcxwcAYIRKE5mMrvmapbUpV+dVpIdKAel/rwXF9AkwRiteBPRo4Pe+sGR3taeCul79n4G9XziPh gBJumfJuEQpzo0tWvLUlK4VqgMpDdIJRMJB0i7AXLKnHrVaDCceXeseGX8ip5myXgsc+yFjSR8g == X-Received: by 2002:a05:600c:54cb:b0:3cf:d0be:1231 with SMTP id iw11-20020a05600c54cb00b003cfd0be1231mr41046365wmb.13.1672833055207; Wed, 04 Jan 2023 03:50:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXtiT4OAvs5Z3Up0F/lEI9FqhR068n9R6EHij/lJKoaaR4xfczgkWJA+osiaE/XasnD1kY5tRQ== X-Received: by 2002:a05:600c:54cb:b0:3cf:d0be:1231 with SMTP id iw11-20020a05600c54cb00b003cfd0be1231mr41046354wmb.13.1672833054932; Wed, 04 Jan 2023 03:50:54 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id j20-20020a05600c191400b003b4fe03c881sm57626187wmq.48.2023.01.04.03.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 03:50:54 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PUSHED] gdb: fix some #ifdef logic in bt-utils.h Date: Wed, 4 Jan 2023 11:50:52 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" In passing I spotted some incorrect #ifdef logic in bt-utils.h. The logic in question has existed since the file was originally added in commit: commit abbbd4a3e0ca51132e7fb31a43f896d29894dae0 Date: Wed Aug 11 13:24:33 2021 +0100 gdb: use libbacktrace to create a better backtrace for fatal signals The code is trying to select between using libbacktrace or using the execinfo supplied backtrace API. First we check to see if we can use libbacktrace. If we can then we include some header files, and then set some defines to indicate that libbacktrace is being used. Then we check if execinfo is available, if it is then we include and set some alternative defines. In theory the second block of logic should not trigger if the first block (that uses libbacktrace) has also triggered, but we incorrectly check the define 'PRINT_BACKTRACE_ON_FATAL_SIGNAL' instead of checking for 'GDB_PRINT_INTERNAL_BACKTRACE_USING_LIBBACKTRACE', so the second block triggers more than it should. The 'PRINT_BACKTRACE_ON_FATAL_SIGNAL' define is not defined anywhere, this was a mistake in the original commit. In reality this is harmless, we include when we don't need too, but in by-utils.c the libbacktrace define is always checked for before the execinfo define, so we never actually end up using the execinfo path (when libbacktrace is available). But I figure its still worth cleaning this up. I've tested GDB in a "default" build where libbacktrace is used, and when configuring with --disable-libbacktrace which causes the execinfo backtrace API to be used instead, both still appear to work fine. There should be no user visible changes after this commit. --- gdb/bt-utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: e24d337e219da287535eddc5c9918ac410d124be diff --git a/gdb/bt-utils.h b/gdb/bt-utils.h index 079410dc8a9..ba887927979 100644 --- a/gdb/bt-utils.h +++ b/gdb/bt-utils.h @@ -32,7 +32,7 @@ #if defined HAVE_EXECINFO_H \ && defined HAVE_EXECINFO_BACKTRACE \ - && !defined PRINT_BACKTRACE_ON_FATAL_SIGNAL + && !defined GDB_PRINT_INTERNAL_BACKTRACE_USING_LIBBACKTRACE # include # define GDB_PRINT_INTERNAL_BACKTRACE # define GDB_PRINT_INTERNAL_BACKTRACE_USING_EXECINFO