From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id BF4A93858C41 for ; Thu, 25 Apr 2024 18:10:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BF4A93858C41 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 BF4A93858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::12d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714068653; cv=none; b=dN7/Zelw16Uo6ZHyme64p3asgwlsNEcSwjOtaBpiYHdAfds88Qyj5+Hbp8atY+ZFAQFEOyER2d5+UbEw2eN5efHOANgVy03INAxlQ03U3/C3aFn2BzzjrYQIvlV/M00isV32KWrvr59CS83tPLF/G0GoXOL81mz5mVTksZmP7TU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714068653; c=relaxed/simple; bh=+GkiDaBULTrRl+nmOK4enVQZGarWQ9rQMkHCPtmKmP4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=pLk01fi/iecApBI082wO2LJDG6UqdwqzjZy5b/AKA/hkOAuW1s4EEug+8OqfAV5aPSN81HyJM2f6mTO4fuL+eTyatEDKf20xld5YQ+7jLXnVnqCYdkpAM6bgkeHwKJqww0Z6OjQkqQOxFEhHpXbTAmp0zWnWOQLHj1uA8ey8+kk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-36b2adedec7so5427065ab.1 for ; Thu, 25 Apr 2024 11:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1714068650; x=1714673450; 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=R6Hq+h/59A4PAyTYgtGuts+WXvEYIE8MoJor96PpM+mLQtFovKm/UV8b348O3g//m2 kkXABaf7gu0CbOGjn4AVNsLjdingYihyr9sMRCh771a4NOk35M1YIEv1FoImzT5/1fEi qgBMUYsaIJK3rU/Jj1HvNBaiwOfYiysPPVMf1sw4iXq6WipXqex2uPcxDbQD0cqbawh6 2tNTduk7f3WXIq3G3vSV7Qsj/oHtiBEr2VFSdkKzY8uTwMjd1tzKnj631dlImu8KmG6C hiAUlK7tVDQNganIa8VcbT91Zbv4j6b55RXsL0jCn1RKneuIPpLTaNB3wGkLipHiDPaV JGzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714068650; x=1714673450; 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=J/18S5UYghcGtUDzOn992Jo6aa98Zq4MRRN92zFx5ENR7vhXMDTwnC8QmgmkecKUb8 8R4RhYayxkYgIcB6jga+ObJ7ZGl+82EqRP8un8z4ELvEIVZ77+PaxXwil9axGRNdmYmb jn0/Gi1lRzwqt18PncwXGJk8PM3lFCePJJVbiiqyt4GUdihHSK8NKPxmJ/EPk8QvTHkv tBhS1/qwgMLIKXeAlhWvcXLk/p0QuXRG0CzqHJ6Tpe61uYwkphcCAZrtcK5TpOsCCQkT RY4u04amexPBY4LtH2SLbGsGFUNbmVxx/cZkSPvS89GbRptI05RgudEFAKiOstbX+IYT 58dQ== X-Gm-Message-State: AOJu0YxC2ei2cVMZxNMue0UnQswOmijEsbXupHk+hMGfeUTF3sMDoprj Q+FHMUuH+BckrewT5wtrJoeilV/gBpInBOSrlAGq10V/BJDe+3F7rbNgd3irEIw21Fd3B4V3LHE = X-Google-Smtp-Source: AGHT+IGjZQUx5yNRDCPVIebdM6jI3Ux8PrFx6h8IfQ4hSSJp+KGZtg4L70bThYY7qtjh2614n+IPig== X-Received: by 2002:a05:6e02:158a:b0:36a:686:bc99 with SMTP id m10-20020a056e02158a00b0036a0686bc99mr711820ilu.4.1714068649982; Thu, 25 Apr 2024 11:10:49 -0700 (PDT) Received: from localhost.localdomain (97-122-86-252.hlrn.qwest.net. [97.122.86.252]) by smtp.gmail.com with ESMTPSA id jm1-20020a0566388c8100b004852136a4dfsm3146550jab.4.2024.04.25.11.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 11:10:49 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/3] Implement tp_richcompare for gdb.Block Date: Thu, 25 Apr 2024 12:09:58 -0600 Message-ID: <20240425181032.80275-3-tromey@adacore.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240425181032.80275-1-tromey@adacore.com> References: <20240425181032.80275-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