From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +PFSE0IGlWL3SQkAWB0awg (envelope-from ) for ; Mon, 30 May 2022 14:00:34 -0400 Received: by simark.ca (Postfix, from userid 112) id 4B5821E221; Mon, 30 May 2022 14:00:34 -0400 (EDT) Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=Nvrj7msE; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 866961E143 for ; Mon, 30 May 2022 14:00:33 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 40563384B0C6 for ; Mon, 30 May 2022 18:00:33 +0000 (GMT) Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id A13373850438 for ; Mon, 30 May 2022 17:59:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A13373850438 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 008A710047D90 for ; Mon, 30 May 2022 17:59:39 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id vjg2ny4dhj8kTvjg2n0fUZ; Mon, 30 May 2022 17:59:38 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=MbSpB7zf c=1 sm=1 tr=0 ts=6295060a a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=oZkIemNP1mAA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=bOemr6JlkcWDDzh2ZA0A: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:References:In-Reply-To: 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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kZnyjxt91dC4+zUd/18//9S18Hc2WVKD9KedMtBWLHg=; b=Nvrj7msEJN2w68to/HyR/KCNhX y7vMw8uqj9mTql7DIigHp0oQMaAaNZ+w/Vz/Cn1BXTejGO6dstw5hj0rQlhra5m4LMmG8fGJLiJzi ffVEI/i0HRafQoTWGsLkB0P02; Received: from 71-211-158-194.hlrn.qwest.net ([71.211.158.194]:45630 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nvjg2-002OyG-A1; Mon, 30 May 2022 11:59:38 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 6/6] Remove some unneeded checks in Guile code Date: Mon, 30 May 2022 11:59:34 -0600 Message-Id: <20220530175934.3872892-7-tom@tromey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220530175934.3872892-1-tom@tromey.com> References: <20220530175934.3872892-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 71.211.158.194 X-Source-L: No X-Exim-ID: 1nvjg2-002OyG-A1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-158-194.hlrn.qwest.net (prentzel.Home) [71.211.158.194]:45630 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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: , Cc: Tom Tromey Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" The Guile code generally checks to see if an htab is non-null before destroying it. However, the registry code already ensures this, so we can change these checks to asserts and simplify the code a little. --- gdb/guile/scm-block.c | 8 +++----- gdb/guile/scm-frame.c | 8 +++----- gdb/guile/scm-symbol.c | 8 +++----- gdb/guile/scm-symtab.c | 8 +++----- gdb/guile/scm-type.c | 9 +++------ 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index a29c2db58f1..07c6a2bd5e5 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -97,11 +97,9 @@ struct bkscm_deleter void operator() (htab_t htab) { - if (htab != NULL) - { - htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL); - htab_delete (htab); - } + gdb_assert (htab != nullptr); + htab_traverse_noresize (htab, bkscm_mark_block_invalid, NULL); + htab_delete (htab); } }; diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index 4132bb246d8..159603b8008 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -95,11 +95,9 @@ struct frscm_deleter void operator() (htab_t htab) { - if (htab != NULL) - { - htab_traverse_noresize (htab, frscm_mark_frame_invalid, NULL); - htab_delete (htab); - } + gdb_assert (htab != nullptr); + htab_traverse_noresize (htab, frscm_mark_frame_invalid, NULL); + htab_delete (htab); } }; diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index 0b96e5a02c1..78917bdbed0 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -70,11 +70,9 @@ struct syscm_deleter void operator() (htab_t htab) { - if (htab != NULL) - { - htab_traverse_noresize (htab, syscm_mark_symbol_invalid, NULL); - htab_delete (htab); - } + gdb_assert (htab != nullptr); + htab_traverse_noresize (htab, syscm_mark_symbol_invalid, NULL); + htab_delete (htab); } }; diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c index 940823147bf..2ff66c49d51 100644 --- a/gdb/guile/scm-symtab.c +++ b/gdb/guile/scm-symtab.c @@ -98,11 +98,9 @@ struct stscm_deleter void operator() (htab_t htab) { - if (htab != NULL) - { - htab_traverse_noresize (htab, stscm_mark_symtab_invalid, NULL); - htab_delete (htab); - } + gdb_assert (htab != nullptr); + htab_traverse_noresize (htab, stscm_mark_symtab_invalid, NULL); + htab_delete (htab); } }; diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c index 2dadbefb3a4..5cb1cabe14d 100644 --- a/gdb/guile/scm-type.c +++ b/gdb/guile/scm-type.c @@ -93,13 +93,10 @@ struct tyscm_deleter if (!gdb_scheme_initialized) return; + gdb_assert (htab != nullptr); htab_up copied_types = create_copied_types_hash (); - - if (htab != NULL) - { - htab_traverse_noresize (htab, tyscm_copy_type_recursive, copied_types.get ()); - htab_delete (htab); - } + htab_traverse_noresize (htab, tyscm_copy_type_recursive, copied_types.get ()); + htab_delete (htab); } }; -- 2.34.1