From patchwork Fri Mar 3 21:12:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 65996 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 427233857352 for ; Fri, 3 Mar 2023 21:13:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 427233857352 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677878033; bh=VJXWarPVQ4tHlAKNy5KeABWFRbptDOc272is+FrJb60=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=nn3zRV21lAZvcL06qSAHmgVUcALWlVl2tU0+yXezkW/9hNEHV8P7W3O/XAtwY3/pZ Zsr0By5vAmsBCyQYIsRDEsPwWHPOT6bUahVxPhK9TKf9GPLxvB/kbi6QhVCZ9gmtoj 1YG9R7Yf2KxrhCAC/sH/iHEID4mQ2KMP3KkOh9VI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by sourceware.org (Postfix) with ESMTPS id 3AF5C3858408 for ; Fri, 3 Mar 2023 21:12:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3AF5C3858408 Received: by mail-io1-xd33.google.com with SMTP id bf15so1524086iob.7 for ; Fri, 03 Mar 2023 13:12:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677877942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VJXWarPVQ4tHlAKNy5KeABWFRbptDOc272is+FrJb60=; b=4Cwe9/rKep/vFbEkM6Soxvs/W7TOp2Rz9Fdev79xrn8CzMdEw9jjhHM+TZ0QZpalXr 7tJcnb2qWiUlZk8NfCX9T8kY7VH9kBCGj6sMN3VQDWuvv6oQbumooVCsQWlYvX1Sh4Vv y6LhXgX9+Fs+dtW2xV0X4GNFII5UREyruZP9WBqWNVCgUp/LnHW6vXYQ1Vw4+LRk4vmG CWFx5nX4Jw4j4NfqRLYg39obWOsMEqIumiQktjbZ70Fm86L3AzCxUp7TOt9dTsQtDxlu k9q/iVJCiOj0/R30HRUb0L4c9EnjuHvWwDWLYLDSThEABi7mKF7EcYTQ8GmR3FgBBJ5i zoIA== X-Gm-Message-State: AO0yUKWpKhGAdcm7D7mzS6ulGXkqrMXn7m6QikL673zi329VdFzH2Gil Xb7a7UPRLTtLTSYHdmB/Jf2w7bECP1Z9P/X25cs= X-Google-Smtp-Source: AK7set8Y+xHYmZsNZ7Dc1kFt9Bw70liUyM+gbC3z4seiS7hIB7GGhIoo6eSF25ApUkuvB8aR9RujMQ== X-Received: by 2002:a05:6602:22c3:b0:74c:8013:867b with SMTP id e3-20020a05660222c300b0074c8013867bmr1961091ioe.15.1677877942437; Fri, 03 Mar 2023 13:12:22 -0800 (PST) Received: from localhost.localdomain (75-166-130-93.hlrn.qwest.net. [75.166.130.93]) by smtp.gmail.com with ESMTPSA id g8-20020a925208000000b00313b281ecd2sm867988ilb.70.2023.03.03.13.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 13:12:22 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 6/8] Use value_true in value_equal and value_less Date: Fri, 3 Mar 2023 14:12:05 -0700 Message-Id: <20230303211207.1053037-7-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303211207.1053037-1-tromey@adacore.com> References: <20230303211207.1053037-1-tromey@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Both value_equal and value_less use value_as_long to check a presumably boolean result of calling value_binop. However, value_binop in this case actually returns an int as wide as its arguments, and this approach can then fail for integers wider than LONGEST. Instead, rewrite this in a form that works for any size integer. --- gdb/valarith.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gdb/valarith.c b/gdb/valarith.c index 9d681dc9d97..99597bef695 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -1761,8 +1761,7 @@ value_equal (struct value *arg1, struct value *arg2) is_int2 = is_integral_type (type2); if (is_int1 && is_int2) - return longest_to_int (value_as_long (value_binop (arg1, arg2, - BINOP_EQUAL))); + return value_true (value_binop (arg1, arg2, BINOP_EQUAL)); else if ((is_floating_value (arg1) || is_int1) && (is_floating_value (arg2) || is_int2)) { @@ -1849,8 +1848,7 @@ value_less (struct value *arg1, struct value *arg2) if ((is_int1 && is_int2) || (is_fixed_point_type (type1) && is_fixed_point_type (type2))) - return longest_to_int (value_as_long (value_binop (arg1, arg2, - BINOP_LESS))); + return value_true (value_binop (arg1, arg2, BINOP_LESS)); else if ((is_floating_value (arg1) || is_int1) && (is_floating_value (arg2) || is_int2)) {