Merge branch '0.29.x'

Cython/Compiler/Nodes.py

@@ -4377,7 +4377,7 @@ class OverrideCheckNode(StatNode):
                        " || (Py_TYPE(%s)->tp_flags & (Py_TPFLAGS_IS_ABSTRACT | Py_TPFLAGS_HEAPTYPE)))) {" % (
                 self_arg, self_arg))
 
-        code.putln("#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP")
+        code.putln("#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP && CYTHON_USE_TYPE_SLOTS")
         code.globalstate.use_utility_code(
             UtilityCode.load_cached("PyDictVersioning", "ObjectHandling.c"))
         # TODO: remove the object dict version check by 'inlining' the getattr implementation for methods.
@@ -4412,7 +4412,7 @@ class OverrideCheckNode(StatNode):
         # NOTE: it's not 100% sure that we catch the exact versions here that were used for the lookup,
         # but it is very unlikely that the versions change during lookup, and the type dict safe guard
         # should increase the chance of detecting such a case.
-        code.putln("#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP")
+        code.putln("#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP && CYTHON_USE_TYPE_SLOTS")
         code.putln("%s = __Pyx_get_tp_dict_version(%s);" % (
             Naming.tp_dict_version_temp, self_arg))
         code.putln("%s = __Pyx_get_object_dict_version(%s);" % (
@@ -4432,7 +4432,7 @@ class OverrideCheckNode(StatNode):
         code.put_decref_clear(func_node_temp, PyrexTypes.py_object_type)
         code.funcstate.release_temp(func_node_temp)
 
-        code.putln("#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP")
+        code.putln("#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_PYTYPE_LOOKUP && CYTHON_USE_TYPE_SLOTS")
         code.putln("}")
         code.putln("#endif")
 

Cython/Utility/ObjectHandling.c

@@ -2444,7 +2444,7 @@ static PyObject* __Pyx_PyNumber_InPlaceMatrixMultiply(PyObject* x, PyObject* y)
 
 /////////////// PyDictVersioning.proto ///////////////
 
-#if CYTHON_USE_DICT_VERSIONS
+#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
 #define __PYX_DICT_VERSION_INIT  ((PY_UINT64_T) -1)
 #define __PYX_GET_DICT_VERSION(dict)  (((PyDictObject*)(dict))->ma_version_tag)
 #define __PYX_UPDATE_DICT_CACHE(dict, value, cache_var, version_var) \
@@ -2474,24 +2474,28 @@ static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UIN
 
 /////////////// PyDictVersioning ///////////////
 
-#if CYTHON_USE_DICT_VERSIONS
+#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
 static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj) {
     PyObject *dict = Py_TYPE(obj)->tp_dict;
-    return dict ? __PYX_GET_DICT_VERSION(dict) : 0;
+    return likely(dict) ? __PYX_GET_DICT_VERSION(dict) : 0;
 }
 
 static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj) {
     PyObject **dictptr = NULL;
     Py_ssize_t offset = Py_TYPE(obj)->tp_dictoffset;
     if (offset) {
-        dictptr = (offset > 0) ? (PyObject **) ((char *)obj + offset) : _PyObject_GetDictPtr(obj);
+#if CYTHON_COMPILING_IN_CPYTHON
+        dictptr = (likely(offset > 0)) ? (PyObject **) ((char *)obj + offset) : _PyObject_GetDictPtr(obj);
+#else
+        dictptr = _PyObject_GetDictPtr(obj);
+#endif
     }
     return (dictptr && *dictptr) ? __PYX_GET_DICT_VERSION(*dictptr) : 0;
 }
 
 static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version) {
     PyObject *dict = Py_TYPE(obj)->tp_dict;
-    if (!dict || tp_dict_version != __PYX_GET_DICT_VERSION(dict))
+    if (unlikely(!dict) || unlikely(tp_dict_version != __PYX_GET_DICT_VERSION(dict)))
         return 0;
     return obj_dict_version == __Pyx_get_object_dict_version(obj);
 }

tests/run/cpdef_method_override.pyx

@@ -31,12 +31,35 @@ cdef class BaseType:
     BaseType.meth
     BaseType.meth
     """
-    def callmeth(self):
+    cpdef callmeth(self):
+        return self.callmeth2()
+    cpdef callmeth2(self):
+        # not overridden by subclasses
         return self.meth()
     cpdef meth(self):
+        # overridden by subclasses
         print("BaseType.meth")
 
 
+class NonOverride(BaseType):
+    """
+    >>> NonOverride().callmeth()
+    BaseType.meth
+    >>> obj = NonOverride()
+    >>> obj.callmeth()
+    BaseType.meth
+    >>> obj.callmeth()
+    BaseType.meth
+    >>> _call_method(NonOverride)
+    BaseType.meth
+    BaseType.meth
+    BaseType.meth
+    BaseType.meth
+    BaseType.meth
+    BaseType.meth
+    """
+
+
 class PyClass(BaseType):
     """
     >>> PyClass().callmeth()
@@ -83,3 +106,34 @@ class PySlotsClass(BaseType):
 
     def meth(self):
         print("PySlotsClass.meth")
+
+
+class DynamicOverride(BaseType):
+    """
+    >>> DynamicOverride().callmeth()
+    meth1
+    >>> obj = DynamicOverride()
+    >>> obj.callmeth()
+    meth1
+    >>> obj.callmeth()
+    meth2
+    >>> obj.callmeth()
+    BaseType.meth
+    >>> obj.callmeth()
+    BaseType.meth
+    >>> _call_method(DynamicOverride)
+    meth1
+    meth1
+    meth2
+    meth1
+    meth2
+    BaseType.meth
+    """
+    def __init__(self):
+        self.meth = self.meth1
+    def meth1(self):
+        self.meth = self.meth2
+        print("meth1")
+    def meth2(self):
+        del self.meth
+        print("meth2")