From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id F031B3857BB3 for ; Fri, 20 Jan 2023 21:46:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F031B3857BB3 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 6B21A1003FBD0 for ; Fri, 20 Jan 2023 21:46:39 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IzDbpfnR5NX2aIzDbpTG1e; Fri, 20 Jan 2023 21:46:39 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63cb0bbf a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=8bGJB5VeUK7IXM0ZKesA: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=aJ1tUA517jMyYaAuQzEm4RuCU9PTG/lpuF0NqNLhAVw=; b=MTJMBKuFDsPzZ07zdc9cYdilE9 xEm6Gx1znq/PvhlxDFQqIls5ikAHWHW+LvpT/TBgow/Mge+0TcS9wVB99G0OP2/4TyfHLf6dqUXj/ VOWRN7QdRTJGOglZd4ejLbJLn; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60138 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 1pIzDb-001GGF-5y; Fri, 20 Jan 2023 14:46:39 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 19/27] Convert explicit iterator uses to foreach Date: Fri, 20 Jan 2023 14:46:10 -0700 Message-Id: <20230120214618.3236224-20-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120214618.3236224-1-tom@tromey.com> References: <20230120214618.3236224-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: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pIzDb-001GGF-5y X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60138 X-Source-Auth: tom+tromey.com X-Email-Count: 20 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.9 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 List-Id: This converts most existing explicit uses of block_iterator to use foreach with the range iterator instead. --- gdb/ada-lang.c | 8 +++----- gdb/compile/compile-c-symbols.c | 7 +------ gdb/guile/scm-block.c | 7 +------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 4d2873cfde4..b5e9f2ecff6 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -6076,18 +6076,14 @@ ada_add_block_symbols (std::vector &result, const lookup_name_info &lookup_name, domain_enum domain, struct objfile *objfile) { - struct block_iterator iter; /* A matching argument symbol, if any. */ struct symbol *arg_sym; /* Set true when we find a matching non-argument symbol. */ bool found_sym; - struct symbol *sym; arg_sym = NULL; found_sym = false; - for (sym = block_iterator_first (block, &iter, &lookup_name); - sym != NULL; - sym = block_iterator_next (&iter)) + for (struct symbol *sym : block_iterator_range (block, &lookup_name)) { if (symbol_matches_domain (sym->language (), sym->domain (), domain)) { @@ -6125,6 +6121,8 @@ ada_add_block_symbols (std::vector &result, const std::string &ada_lookup_name = lookup_name.ada ().lookup_name (); const char *name = ada_lookup_name.c_str (); size_t name_len = ada_lookup_name.size (); + struct symbol *sym; + struct block_iterator iter; ALL_BLOCK_SYMBOLS (block, iter, sym) { diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index 678cbcd5c44..e7d565bcd77 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -633,14 +633,9 @@ generate_c_for_variable_locations (compile_instance *compiler, while (1) { - struct symbol *sym; - struct block_iterator iter; - /* Iterate over symbols in this block, generating code to compute the location of each local variable. */ - for (sym = block_iterator_first (block, &iter); - sym != NULL; - sym = block_iterator_next (&iter)) + for (struct symbol *sym : block_iterator_range (block)) { if (!symbol_seen (symhash.get (), sym)) generate_c_for_for_one_variable (compiler, stream, gdbarch, diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index c9d847a4d60..02b7a48be37 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -501,20 +501,15 @@ gdbscm_block_symbols (SCM self) block_smob *b_smob = bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct block *block = b_smob->block; - struct block_iterator iter; - struct symbol *sym; SCM result; result = SCM_EOL; - sym = block_iterator_first (block, &iter); - - while (sym != NULL) + for (struct symbol *sym : block_iterator_range (block)) { SCM s_scm = syscm_scm_from_symbol (sym); result = scm_cons (s_scm, result); - sym = block_iterator_next (&iter); } return scm_reverse_x (result, SCM_EOL); -- 2.39.0