From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EaLcDNXqsmkoLyYAWB0awg (envelope-from ) for ; Thu, 12 Mar 2026 12:33:25 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=a7g1Mt60; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2F0A41E0DD; Thu, 12 Mar 2026 12:33:25 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 9CAE01E089 for ; Thu, 12 Mar 2026 12:33:24 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 25CBE4BBCDDB for ; Thu, 12 Mar 2026 16:33:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25CBE4BBCDDB Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=a7g1Mt60 Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 43B614BBCDA5 for ; Thu, 12 Mar 2026 16:32:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 43B614BBCDA5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 43B614BBCDA5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773333142; cv=none; b=MwIGM7E/AeAB+mN50o53ajkfTXFa2Ju+ZMIzfS943JLSjFqfywTHT9sCcdEwfGp6AVnELpMQziIzc3DFLgndXuasbs7UlpEx2lRtPQeOfC/dnKXt8TdLlDmTQXscxC9Q/2YW1MORc+UNw6WL1bK3Ns8w6SrK+R2yGWy++QUCdng= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773333142; c=relaxed/simple; bh=jT1S5E+mcFk2Rbr5IA/JoWMBMda1t5WdQHJYVSedCms=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rWqGHZq672Yt1ZHZKTeJxbtrIvyOeWn02A/oRNye7qg9vkSlNYpR/aJRNDAvWE2BDLq06+x0KXIjiuATyueHl6OxpnB+BDk9uXzP09U4aKtIqVYV+6G3PdvzyHaIRUlZNJp/MySInaSNABmZeE7TMJj08kht9pbricvuNv9ADVg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 43B614BBCDA5 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 62CGWFol148909 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Mar 2026 12:32:20 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 62CGWFol148909 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=oct2025; t=1773333140; bh=zilhxQV6ti5tUW25rNSrp3Lq2eZpTQd8gyBWRcxFsm4=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=a7g1Mt60hz6UzgLI/MSndXQEohOI9eMI5cCzRtlmcpAn0ErbUraYRpn9xQIpkiJXa +7NuVxSOCuwgM1VN/MTWygiXbJcI2wawZb4UhK5WRRHweH3n6eBfxZByCDNkjsTpru AEcrfisTL/9ukAYhwvw8W2HCtmx+ya+/peB37TJ9BrZL481Z6HWhEvXs7HqhgHSUmE iyRKbH1c4z6YLTTawGxwFUfjkJxbtoyUNcY5Z74m+L2Rwnm4D/ELEXNeR9/Z9FLUA1 6HppO12vKEFtwFuacqF7E4O0I2LBToC8QsbKxY/4C2hi9DnXgkI/1qCNIntvNHgNLG qHH5XYNrK1pDQ== Received: by simark.ca (Postfix) id 651EB1E09A; Thu, 12 Mar 2026 12:32:14 -0400 (EDT) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/2] gdb/dwarf: rename low_set variable in dwarf2_ranges_read Date: Thu, 12 Mar 2026 12:32:03 -0400 Message-ID: <20260312163213.2650909-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312163213.2650909-1-simon.marchi@polymtl.ca> References: <20260312163213.2650909-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Thu, 12 Mar 2026 16:32:16 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org From: Simon Marchi Rename low_set to low_high_set, to reflect what it really means. Also, change some manual min/max so use std::min/std::max, I think it makes the intent clearer. Change-Id: I9ca81be915962e704becabe78c39b95e0abf561b --- gdb/dwarf2/read.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 5e310afc3f92..495b519faed4 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -8717,7 +8717,7 @@ dwarf2_ranges_read (unsigned offset, unrelocated_addr *low_return, unrelocated_addr *high_return, struct dwarf2_cu *cu, addrmap_mutable *map, void *datum, dwarf_tag tag) { - bool low_set = false; + bool low_high_set = false; unrelocated_addr low = {}; unrelocated_addr high = {}; bool retval = dwarf2_ranges_process (offset, cu, tag, @@ -8735,29 +8735,26 @@ dwarf2_ranges_read (unsigned offset, unrelocated_addr *low_return, segment of consecutive addresses. We should have a data structure for discontiguous block ranges instead. */ - if (!low_set) + if (!low_high_set) { low = range_beginning; high = range_end; - low_set = true; + low_high_set = true; } else { - if (range_beginning < low) - low = range_beginning; - - if (range_end > high) - high = range_end; + low = std::min (low, range_beginning); + high = std::max (high, range_end); } }); if (!retval) return false; - if (!low_set) + if (!low_high_set) { /* If the first entry is an end-of-list marker, the range - describes an empty scope, i.e. no instructions. */ + describes an empty scope, i.e. no instructions. */ return false; } -- 2.53.0