commit a8b27e623d75377aabe50df27e97cab4e81a174a
author Jeroen Demeyer <J.Demeyer@UGent.be> Mon Jun 24 12:41:05 2019 +0200
committer Petr Viktorin <encukou@gmail.com> Mon Jun 24 12:41:05 2019 +0200
tree 91879278e60ec4e8c6a35f2688aa60cdb2a59a8a
parent 47fbc4e45b35b3111e2d947a66490a43ac21d363

bpo-36974: inherit tp_vectorcall_offset unconditionally (GH-13858)

Objects/call.c

diff --git a/Objects/call.c b/Objects/call.c
index 8a1ce7f..bde5513 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -184,7 +184,7 @@
     /* get vectorcallfunc as in _PyVectorcall_Function, but without
      * the _Py_TPFLAGS_HAVE_VECTORCALL check */
     Py_ssize_t offset = Py_TYPE(callable)->tp_vectorcall_offset;
-    if ((offset <= 0) || (!Py_TYPE(callable)->tp_call)) {
+    if (offset <= 0) {
         PyErr_Format(PyExc_TypeError, "'%.200s' object does not support vectorcall",
                      Py_TYPE(callable)->tp_name);
         return NULL;

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index e495251..f814333 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5153,15 +5153,15 @@
     COPYSLOT(tp_repr);
     /* tp_hash see tp_richcompare */
     {
-        /* Inherit tp_vectorcall_offset only if tp_call is not overridden */
-        if (!type->tp_call) {
-            COPYSLOT(tp_vectorcall_offset);
-        }
-        /* Inherit_Py_TPFLAGS_HAVE_VECTORCALL for non-heap types
+        /* Always inherit tp_vectorcall_offset to support PyVectorcall_Call().
+         * If _Py_TPFLAGS_HAVE_VECTORCALL is not inherited, then vectorcall
+         * won't be used automatically. */
+        COPYSLOT(tp_vectorcall_offset);
+
+        /* Inherit _Py_TPFLAGS_HAVE_VECTORCALL for non-heap types
         * if tp_call is not overridden */
         if (!type->tp_call &&
             (base->tp_flags & _Py_TPFLAGS_HAVE_VECTORCALL) &&
-            !(type->tp_flags & _Py_TPFLAGS_HAVE_VECTORCALL) &&
             !(type->tp_flags & Py_TPFLAGS_HEAPTYPE))
         {
             type->tp_flags |= _Py_TPFLAGS_HAVE_VECTORCALL;