From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mEtqGwZIzl95RwAAWB0awg (envelope-from ) for ; Mon, 07 Dec 2020 10:19:34 -0500 Received: by simark.ca (Postfix, from userid 112) id 6E0A71F096; Mon, 7 Dec 2020 10:19:34 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.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 9DA581E552 for ; Mon, 7 Dec 2020 10:19:33 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2329C3982E2B; Mon, 7 Dec 2020 15:19:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2329C3982E2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607354373; bh=d1O5dKaz5dLnetAAYROdwy6zWtUHn7zOsm7XQKhdAok=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=I7lbmVs40Uc3RukKA27MnGqc8sQc0vimlLsroZuxg6oHUTxgvn2acp4U2NILH558f 0VUmOZuxVDQdyx7tfAIcCyMrIc24F0Usk0B7i8Z79DfMKDulTBLMd1g/o1GUdyAY9G LszCpaqXMf5bONIbQ6rTReWiw1bqWwQlfc2m6X7Q= Received: from mail.efficios.com (mail.efficios.com [167.114.26.124]) by sourceware.org (Postfix) with ESMTPS id 9B0C83982E1F for ; Mon, 7 Dec 2020 15:19:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9B0C83982E1F Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 65428300533; Mon, 7 Dec 2020 10:19:30 -0500 (EST) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id XteA9sDC5Ibg; Mon, 7 Dec 2020 10:19:30 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 199883004C6; Mon, 7 Dec 2020 10:19:30 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 199883004C6 X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PsOZiOVVUOeY; Mon, 7 Dec 2020 10:19:30 -0500 (EST) Received: from [10.0.0.11] (173-246-6-90.qc.cable.ebox.net [173.246.6.90]) by mail.efficios.com (Postfix) with ESMTPSA id 02D3A30062A; Mon, 7 Dec 2020 10:19:29 -0500 (EST) Subject: Re: [PATCH 2/4] gdb: make get_discrete_bounds return bool To: Joel Brobecker , Simon Marchi via Gdb-patches References: <20201123162120.3778679-1-simon.marchi@efficios.com> <20201123162120.3778679-3-simon.marchi@efficios.com> <20201206060327.GA327270@adacore.com> Message-ID: <71a9a506-954d-e5a4-88d0-67a3e2d97690@efficios.com> Date: Mon, 7 Dec 2020 10:19:29 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.3 MIME-Version: 1.0 In-Reply-To: <20201206060327.GA327270@adacore.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" On 2020-12-06 1:03 a.m., Joel Brobecker wrote: > Hi Simon, > > On Mon, Nov 23, 2020 at 11:21:18AM -0500, Simon Marchi via Gdb-patches wrote: >> get_discrete_bounds currently has three possible return values (see its >> current doc for details). It appears that for all callers, it would be >> sufficient to have a boolean "worked" / "didn't work" return value. >> >> Change the return type of get_discrete_bounds to bool and adjust all >> callers. Doing so simplifies the following patch. >> >> gdb/ChangeLog: >> >> * gdbtypes.h (get_discrete_bounds): Return bool, adjust all >> callers. >> * gdbtypes.c (get_discrete_bounds): Return bool. >> >> Change-Id: Ie51feee23c75f0cd7939742604282d745db59172 > > A small reminder to remember to remove the Change-Id... > > Other than that, the change looks good to me. > > This is a very nice simplification of the interface, IMO, so thank you > for doing that. In reading the documentation prior to this change, > it was hard for me to wrap my head around what it the function was > really doing. In trying to understand the initial motivation, I did > a bit of archeology, and it goes all the way back to the initial creation > of the sourceware repository (20 years ago already!), so no obvious > explanation from there. > >> @@ -399,7 +399,7 @@ m2_language::value_print_inner (struct value *val, struct ui_file *stream, >> >> fputs_filtered ("{", stream); >> >> - i = get_discrete_bounds (range, &low_bound, &high_bound); >> + i = get_discrete_bounds (range, &low_bound, &high_bound) ? 0 : -1; >> maybe_bad_bstring: >> if (i < 0) >> { > > FTR, this hunk required a bit more context to investigate. We can see > that the change looks correct when looking at how variable "i" is > (mis)used: > > i = get_discrete_bounds (range, &low_bound, &high_bound) ? 0 : -1; > maybe_bad_bstring: > if (i < 0) > { > fputs_styled (_(""), metadata_style.style (), > stream); > goto done; > } > > for (i = low_bound; i <= high_bound; i++) > > Because of the use of labels, it's hard to propose a simpler rewriting > which one would feel confident about without testing... Indeed this code is really messy. For the error handling of the value_bit_index, it just assigns `i` again and jumps back to maybe_bad_bstring, this is crazy. It's really tempting to do more cleanup, but I prefer to just to the bare minimum changes in the Modula and Pascal code. Simon > > >> diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c >> index 428b2efc656..8f785b71ea4 100644 >> --- a/gdb/p-valprint.c >> +++ b/gdb/p-valprint.c >> @@ -343,7 +343,8 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, >> >> fputs_filtered ("[", stream); >> >> - int bound_info = get_discrete_bounds (range, &low_bound, &high_bound); >> + int bound_info = (get_discrete_bounds (range, &low_bound, &high_bound) >> + ? 0 : -1); >> if (low_bound == 0 && high_bound == -1 && TYPE_LENGTH (type) > 0) >> { >> /* If we know the size of the set type, we can figure out the > > Similar story here. >