From: Hai Shi <shihai1992@gmail.com>
Date: Mon, 4 May 2020 13:31:38 +0000 (+0800)
Subject: bpo-39573: Use Py_IS_TYPE to check for types (GH-19882)
X-Git-Tag: v3.9.0b1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e8ffe147710e449c2e935a4e2ff5cbd19828a8a;p=thirdparty%2FPython%2Fcpython.git

bpo-39573: Use Py_IS_TYPE to check for types (GH-19882)
---

diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
index c06d79c55619..4d511a239063 100644
--- a/Objects/genericaliasobject.c
+++ b/Objects/genericaliasobject.c
@@ -424,8 +424,8 @@ ga_getattro(PyObject *self, PyObject *name)
 static PyObject *
 ga_richcompare(PyObject *a, PyObject *b, int op)
 {
-    if (Py_TYPE(a) != &Py_GenericAliasType ||
-        Py_TYPE(b) != &Py_GenericAliasType ||
+    if (!Py_IS_TYPE(a, &Py_GenericAliasType) ||
+        !Py_IS_TYPE(b, &Py_GenericAliasType) ||
         (op != Py_EQ && op != Py_NE))
     {
         Py_RETURN_NOTIMPLEMENTED;
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index c2ddc162ac82..db0ae970090b 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -6306,7 +6306,7 @@ FUNCNAME(PyObject *self, PyObject *other) \
         stack[1] = other; \
         r = vectorcall_maybe(tstate, &op_id, stack, 2); \
         if (r != Py_NotImplemented || \
-            Py_TYPE(other) == Py_TYPE(self)) \
+            Py_IS_TYPE(other, Py_TYPE(self))) \
             return r; \
         Py_DECREF(r); \
     } \