From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id 037523858D34 for ; Tue, 30 Apr 2024 13:17:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 037523858D34 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 037523858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714483040; cv=none; b=oqX+h7mCfsmjLOwruenU8VJQ1R6H/t/4eLnYkD4hdGsUPbrE8LS866NlMxjfZhajnBW9Dd1nSXyerqnqSbr0H17B1KwHxa56uMI4QD2MbxLBzLFNIi4gBZsPqr5qGv63xoNFxK7b5TSmhqtYRgmXibsp+LKtVupoHWMoSmv8gNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714483040; c=relaxed/simple; bh=+GkiDaBULTrRl+nmOK4enVQZGarWQ9rQMkHCPtmKmP4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=b3tPAtB0nNsMmH/rH0SQ2MxVmdc7bjeCd5qfrfBssDgeC2+9tgjkJdJT4q5uM+aCK2xZl4uJv/tqCRl6hRSdEoAXPb63bFrTX0fa5EVG4tMBGe57h5yesu5C1qWOdYZqdFvJj0DdwYu18+ZNDOD04o5l2Ot53NKWZBShIsj4mSo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-7de9261da9bso278622839f.0 for ; Tue, 30 Apr 2024 06:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1714483036; x=1715087836; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tf35t2psRkqoc9qUA7E9VTrUneYK4Xi2QR3RWu3vPYo=; b=MrB/7qF8P75WPJdA++ncCJIP03b3fK5RV+XoY4XKmpxUMSJyaUAmcDnzFJLJ/12q4h Izw/rg13r6pcZY90BFZwW67UKZnXBFVChme8bxlJ1cYqywdjXRA7BH9SMLpZp7tp7r7n roTcU9BKl8zN6EIhQMgCkOVrDispS7Sr1gLH6H87Hm1CjEBRCOCkg7rwR97vEnnezB3s jZxtHZg9tQu/Cfg00y2oT4VrpAd0kVlIpv7y9oqZQUaxrE03E9HFaq5ItWi74P0wLX51 Fb+9WIiPxAe2zJSZIcfE7JyDfkSq/LWls5ILLy73sfu2SQSI84yKxGoqpPkjD9jaN25Z qhJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714483036; x=1715087836; 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=Tf35t2psRkqoc9qUA7E9VTrUneYK4Xi2QR3RWu3vPYo=; b=nqE007IlunIHC3steoueJ+uGFd399IJsGkcWKOQw79XEFMspcq/HbOmx6v08Stdaoq g5avgtimBgq0R0eTeQKRrH/lugGpSg0aN0uXsMtxQIXhwkLgc2V67rmPc34rFfRARh1D 7zv81TZXnEpc9gPbo18EtpBWD+hNqC79cvTU/KLR+9B/Atmjb3cu+rdwRlK+ALcAhuZH M7pAlEWRUE+jR98U1KlKF3BVvbeRfxQrh9T+x1yUv7i43nYE7m9JVIba1Y+cybaaERbJ F2NX2mxXVgMmL8wRS0bLsBm30/9/Xlm9WhS1UB0PuUo5GO1KWW5vUhVcCeTWZFXidhdz Pymw== X-Gm-Message-State: AOJu0YxtwSbjElI7h5hvL+a0xbK8H7XYa21bJmRtvXqEhxdI60jRJns9 GP/aFWMIkgaa5Bs253A2M3zP41TFOxjGMZw8PnLudZ6vtNGViaM8fYrRyT9nxd21ZfUlJxzWagE = X-Google-Smtp-Source: AGHT+IHUwDYLZN/xdpSUETnfLvXJvlPUWs/MzOf3EUC/KywHHsPC+/LViL99ys81rIjdfkSKuus5kA== X-Received: by 2002:a6b:6c08:0:b0:7d9:d941:455f with SMTP id a8-20020a6b6c08000000b007d9d941455fmr13652124ioh.15.1714483034205; Tue, 30 Apr 2024 06:17:14 -0700 (PDT) Received: from localhost.localdomain (97-122-86-252.hlrn.qwest.net. [97.122.86.252]) by smtp.gmail.com with ESMTPSA id s14-20020a056638218e00b00485086807b1sm6424819jaj.156.2024.04.30.06.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 06:17:13 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 2/3] Implement tp_richcompare for gdb.Block Date: Tue, 30 Apr 2024 07:15:32 -0600 Message-ID: <20240430131702.218184-3-tromey@adacore.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430131702.218184-1-tromey@adacore.com> References: <20240430131702.218184-1-tromey@adacore.com> 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 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: I noticed that two gdb.Block objects will never compare as equal with '=='. This patch fixes the problem by implementing tp_richcompare, as was done for gdb.Frame. --- gdb/python/py-block.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c index 3e30faf0856..3de6200e7c2 100644 --- a/gdb/python/py-block.c +++ b/gdb/python/py-block.c @@ -452,6 +452,28 @@ blpy_repr (PyObject *self) name, str.c_str ()); } +/* Implements the equality comparison for Block objects. All other + comparison operators will throw NotImplemented, as they aren't + valid for blocks. */ + +static PyObject * +blpy_richcompare (PyObject *self, PyObject *other, int op) +{ + if (!PyObject_TypeCheck (other, &block_object_type) + || (op != Py_EQ && op != Py_NE)) + { + Py_INCREF (Py_NotImplemented); + return Py_NotImplemented; + } + + block_object *self_block = (block_object *) self; + block_object *other_block = (block_object *) other; + + bool expected = self_block->block == other_block->block; + bool equal = op == Py_EQ; + return PyBool_FromLong (equal == expected); +} + static int CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION gdbpy_initialize_blocks (void) { @@ -530,7 +552,7 @@ PyTypeObject block_object_type = { "GDB block object", /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ - 0, /* tp_richcompare */ + blpy_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ blpy_iter, /* tp_iter */ 0, /* tp_iternext */ -- 2.44.0