From patchwork Wed Mar 8 20:56:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66146 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 B40183850848 for ; Wed, 8 Mar 2023 20:56:54 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id D9ABC3858D33 for ; Wed, 8 Mar 2023 20:56:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D9ABC3858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 2A626100403D1 for ; Wed, 8 Mar 2023 20:56:40 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id a0q0pOk9D9Qs9a0q0p07Rk; Wed, 08 Mar 2023 20:56:40 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=PJbKRdmC c=1 sm=1 tr=0 ts=6408f688 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=k__wU0fu6RkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=RJ3m8223bdlIjVBfpnoA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Xww14N6s0nLZfVdDLlS9oB9KyBkZpYW+HZzJm7L0f1c=; b=BfYIYGhvGhd8atOr7c9la5OFwB Bw3EGo/uIfrDUa2WLif0P/0kVzwc6aair++Pfdg8XDiuVAo6zgksq8EraScN+wyy5+PPWF7DLcOFJ Z+o22Sfnwzl1mkeZaPkdcHyyy; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:44990 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pa0pz-000eU9-R8; Wed, 08 Mar 2023 13:56:39 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Fix htab_t pretty-printer for NULL values Date: Wed, 8 Mar 2023 13:56:28 -0700 Message-Id: <20230308205628.4021427-1-tom@tromey.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.130.93 X-Source-L: No X-Exim-ID: 1pa0pz-000eU9-R8 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net (localhost.localdomain) [75.166.130.93]:44990 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I was debugging gdb and was surprised to see this in a compunit_symtab: m_call_site_htab = , Debugging showed that the field was not uninitialized; rather, the htab_t pretty-printer did not cope with NULL. --- gdb/gdb-gdb.py.in | 5 +++++ gdb/testsuite/gdb.gdb/python-helper.exp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in index 56d063cd506..567ec41b305 100644 --- a/gdb/gdb-gdb.py.in +++ b/gdb/gdb-gdb.py.in @@ -379,10 +379,15 @@ class HtabPrinter: return "array" def to_string(self): + if int(self._val) == 0: + return "(null)" n = int(self._val["n_elements"]) - int(self._val["n_deleted"]) return "htab_t with {} elements".format(n) def children(self): + if int(self._val) == 0: + return + size = int(self._val["size"]) entries = self._val["entries"] diff --git a/gdb/testsuite/gdb.gdb/python-helper.exp b/gdb/testsuite/gdb.gdb/python-helper.exp index 16b419984cf..be0b311e8ca 100644 --- a/gdb/testsuite/gdb.gdb/python-helper.exp +++ b/gdb/testsuite/gdb.gdb/python-helper.exp @@ -211,6 +211,8 @@ proc test_python_helper {} { # Test the htab_t pretty-printer. gdb_test -prompt $outer_prompt_re "print all_bfds" "htab_t with ${::decimal} elements = \\{${::hex}.*\\}" + gdb_test -prompt $outer_prompt_re "print (htab_t) 0x0" \ + [string_to_regexp " = (null)"] return 0 }