From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id 5862F3857722 for ; Wed, 19 Apr 2023 15:09:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5862F3857722 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-7606e2d0376so4573939f.3 for ; Wed, 19 Apr 2023 08:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1681916981; x=1684508981; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DXbG5g+Fr3H/CJN1y9dNA93MOoZ4JLHF6VJnyEi3hbk=; b=d3k9PTWM0YJdMIBMKkHpIztstbIJR0kAaQwanMERyWouSRI/sZdLbBMlYTeS303kjg vlXe5/UrDU24/LopEulqQLozIIN5anE/kQDD3nUyUZ2f/Rc805cvmghKcV4kae5V/EZo anKR/MVJa/15mmBKNqDUv0RYZVSMB2tZ+AVj6q6uERLT/oF3F9vQbAJaCUdM7suoZmWQ 1j1BjQ62JhbD5mrsxdrDB5aHw1p/CLmQSENNjATpO/d8fvMLJFK2QQM3D8w6eb9yxB17 a9ssqA0hVrFi733/Iu4yRAMsAFKmamG21m5zsxDa9ctElVqjds2RDH+EecHhBMTQUCr3 IXsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681916981; x=1684508981; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DXbG5g+Fr3H/CJN1y9dNA93MOoZ4JLHF6VJnyEi3hbk=; b=PGEsm91cuXG0gZMe9SmtrT8U12AFQURz9r2ITH3MJSiYkGmgkbI9mdNFc5l5wMx5d6 7xTo4GBZh4S4NCfMAmaQ6l80g8yulIUsjAyE98W8xv7mkfxPIeKj32OEDyMHpptLz4bz 9/Irn2xT6Ucj1E/lJxGSQ+T2FyErc+v6Tog9NNdiSTSxsinejTBr9xBJczd2cOlNdG7o 7oxtgPSpzgeB6FYGwbIr45KxB7gFJ2NBxccOCp4olLWENviJjiggeujvcFPcP3jLM8/R OqTKt0gt9Vz+kUdmJI+jxhVKZoY2Y3/SgSeISVYN+YWip6dyGf1Fj7NCJon51nKphDtJ cOlQ== X-Gm-Message-State: AAQBX9frxK4ZVqdAhZFjawstX1q6A+YqILX3T9we/A9L5DQPLEHpXlnb 6BZKSlDWDDcfOMJTGlrU25bQW0diA8dtgpHlrm0GcA== X-Google-Smtp-Source: AKy350bVRUnQqrequKXdGQiYRFZoSKPuQ5I4PZ2T/9P55DzJC4QdFPB6lsvzNiif+xERvNxZ8qzY9g== X-Received: by 2002:a5d:9c5a:0:b0:763:7a92:7669 with SMTP id 26-20020a5d9c5a000000b007637a927669mr246749iof.14.1681916981494; Wed, 19 Apr 2023 08:09:41 -0700 (PDT) Received: from localhost.localdomain (71-211-191-82.hlrn.qwest.net. [71.211.191.82]) by smtp.gmail.com with ESMTPSA id ck20-20020a0566383f1400b0040f94e539eesm3365106jab.136.2023.04.19.08.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 08:09:40 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Rewrite gdb_mpz::operator== Date: Wed, 19 Apr 2023 09:09:31 -0600 Message-Id: <20230419150931.2047832-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 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,T_SCC_BODY_TEXT_LINE 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: Simon pointed out that the recent changes to gdb_mpz caused a build failure on macOS. It turns out to be somewhat difficult to overload a method in a way that will work "naturally" for all integer types; especially in a case like gdb_mpz::operator==, where it's desirable to special case all integer types that are no wider than 'long'. After a false start, I came up with this patch, which seems to work. It applies the desirable GMP special cases directly in the body, rather than via overloads. --- gdb/gmp-utils.h | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/gdb/gmp-utils.h b/gdb/gmp-utils.h index d05c11ecbe4..3586d01b0f9 100644 --- a/gdb/gmp-utils.h +++ b/gdb/gmp-utils.h @@ -323,31 +323,21 @@ struct gdb_mpz return mpz_cmp_si (m_val, other) < 0; } - bool operator== (int other) const - { - return mpz_cmp_si (m_val, other) == 0; - } - - bool operator== (long other) const - { - return mpz_cmp_si (m_val, other) == 0; - } - - bool operator== (unsigned long other) const - { - return mpz_cmp_ui (m_val, other) == 0; - } - template, - std::integral_constant sizeof (long))>> - > - > - bool operator== (T src) - { - return *this == gdb_mpz (src); + typename = gdb::Requires>> + bool operator== (T other) const + { + if (std::is_signed::value) + { + if (other == (T) (long) other) + return mpz_cmp_si (m_val, other) == 0; + } + else + { + if (other == (T) (unsigned long) other) + return mpz_cmp_ui (m_val, other) == 0; + } + return *this == gdb_mpz (other); } bool operator== (const gdb_mpz &other) const -- 2.39.1