WIP

mypyc/lib-rt/bytes_ops.c

@@ -4,6 +4,7 @@
 
 #include <Python.h>
 #include "CPy.h"
+#include "pythonsupport.h"
 
 // Returns -1 on error, 0 on inequality, 1 on equality.
 //

mypyc/lib-rt/dict_ops.c

@@ -4,6 +4,7 @@
 
 #include <Python.h>
 #include "CPy.h"
+#include "pythonsupport.h"
 
 #ifndef Py_TPFLAGS_MAPPING
 #define Py_TPFLAGS_MAPPING (1 << 6)
@@ -230,12 +231,11 @@ PyObject *CPyDict_Keys(PyObject *dict) {
     if (view == NULL) {
         return NULL;
     }
-    PyObject *res = _PyList_Extend((PyListObject *)list, view);
+    int res = PyList_Extend(list, view);
     Py_DECREF(view);
-    if (res == NULL) {
+    if (res == -1) {
         return NULL;
     }
-    Py_DECREF(res);
     return list;
 }
 
@@ -250,12 +250,11 @@ PyObject *CPyDict_Values(PyObject *dict) {
     if (view == NULL) {
         return NULL;
     }
-    PyObject *res = _PyList_Extend((PyListObject *)list, view);
+    int res = PyList_Extend(list, view);
     Py_DECREF(view);
-    if (res == NULL) {
+    if (res == -1) {
         return NULL;
     }
-    Py_DECREF(res);
     return list;
 }
 
@@ -270,12 +269,11 @@ PyObject *CPyDict_Items(PyObject *dict) {
     if (view == NULL) {
         return NULL;
     }
-    PyObject *res = _PyList_Extend((PyListObject *)list, view);
+    int res = PyList_Extend(list, view);
     Py_DECREF(view);
-    if (res == NULL) {
+    if (res == -1) {
         return NULL;
     }
-    Py_DECREF(res);
     return list;
 }
 

mypyc/lib-rt/getargsfast.c

@@ -17,6 +17,7 @@
 
 #include <Python.h>
 #include "CPy.h"
+#include "pythonsupport.h"
 
 #define PARSER_INITED(parser) ((parser)->kwtuple != NULL)
 

mypyc/lib-rt/init.c

@@ -1,5 +1,6 @@
 #include <Python.h>
 #include "CPy.h"
+#include "pythonsupport.h"
 
 struct ExcDummyStruct _CPy_ExcDummyStruct = { PyObject_HEAD_INIT(NULL) };
 PyObject *_CPy_ExcDummy = (PyObject *)&_CPy_ExcDummyStruct;

mypyc/lib-rt/list_ops.c

@@ -256,7 +256,11 @@ int CPyList_Insert(PyObject *list, CPyTagged index, PyObject *value)
 }
 
 PyObject *CPyList_Extend(PyObject *o1, PyObject *o2) {
-    return _PyList_Extend((PyListObject *)o1, o2);
+    int res = PyList_Extend(o1, o2);
+    if (res == -1) {
+        return NULL;
+    }
+    return Py_None;
 }
 
 // Return -2 or error, -1 if not found, or index of first match otherwise.

mypyc/lib-rt/mypyc_util.h

@@ -118,4 +118,12 @@ static inline void CPyLong_SetUnsignedSize(PyLongObject *o, Py_ssize_t n) {
 // Are we targeting Python 3.13 or newer?
 #define CPY_3_13_FEATURES (PY_VERSION_HEX >= 0x030d0000)
 
+#if CPY_3_13_FEATURES
+
+#define CPY_GET_OPTIONAL_ATTR
+
+#else
+
+#endif
+
 #endif

mypyc/lib-rt/pythonsupport.h

@@ -14,7 +14,23 @@
 #include "mypyc_util.h"
 
 #if CPY_3_12_FEATURES
+#ifndef Py_BUILD_CORE
+#define Py_BUILD_CORE
+#endif
+#include "internal/pycore_frame.h"
+#undef Py_BUILD_CORE
+#endif
+
+#if CPY_3_13_FEATURES
+#ifndef Py_BUILD_CORE
+#define Py_BUILD_CORE
+#endif
+#include "internal/pycore_bytesobject.h"
+#include "internal/pycore_call.h"
 #include "internal/pycore_frame.h"
+#include "internal/pycore_object.h"
+#include "internal/pycore_unicodeobject.h"
+#undef Py_BUILD_CORE
 #endif
 
 #ifdef __cplusplus
@@ -48,7 +64,7 @@ update_bases(PyObject *bases)
             }
             continue;
         }
-        if (_PyObject_LookupAttrId(base, &PyId___mro_entries__, &meth) < 0) {
+        if (PyObject_GetOptionalAttrString(base, PyId___mro_entries__.string, &meth) < 0) {
             goto error;
         }
         if (!meth) {
@@ -59,7 +75,7 @@ update_bases(PyObject *bases)
             }
             continue;
         }
-        new_base = _PyObject_FastCall(meth, stack, 1);
+        new_base = PyObject_Vectorcall(meth, stack, 1, NULL);
         Py_DECREF(meth);
         if (!new_base) {
             goto error;
@@ -108,7 +124,7 @@ init_subclass(PyTypeObject *type, PyObject *kwds)
     PyObject *super, *func, *result;
     PyObject *args[2] = {(PyObject *)type, (PyObject *)type};
 
-    super = _PyObject_FastCall((PyObject *)&PySuper_Type, args, 2);
+    super = PyObject_Vectorcall((PyObject *)&PySuper_Type, args, 2, NULL);
     if (super == NULL) {
         return -1;
     }
@@ -119,7 +135,7 @@ init_subclass(PyTypeObject *type, PyObject *kwds)
         return -1;
     }
 
-    result = _PyObject_FastCallDict(func, NULL, 0, kwds);
+    result = PyObject_VectorcallDict(func, NULL, 0, kwds);
     Py_DECREF(func);
     if (result == NULL) {
         return -1;
@@ -307,7 +323,7 @@ list_count(PyListObject *self, PyObject *value)
     return CPyTagged_ShortFromSsize_t(count);
 }
 
-#define CPyUnicode_EqualToASCIIString(x, y) _PyUnicode_EqualToASCIIString(x, y)
+#define CPyUnicode_EqualToASCIIString(x, y) PyUnicode_EqualToUTF8(x, y)
 
 // Adapted from genobject.c in Python 3.7.2
 // Copied because it wasn't in 3.5.2 and it is undocumented anyways.
@@ -374,7 +390,7 @@ _CPyDictView_New(PyObject *dict, PyTypeObject *type)
 static int
 _CPyObject_HasAttrId(PyObject *v, _Py_Identifier *name) {
     PyObject *tmp = NULL;
-    int result = _PyObject_LookupAttrId(v, name, &tmp);
+    int result = PyObject_GetOptionalAttrString(v, name->string, &tmp);
     if (tmp) {
         Py_DECREF(tmp);
     }

mypyc/lib-rt/str_ops.c

@@ -117,6 +117,7 @@ PyObject *CPyStr_Build(Py_ssize_t len, ...) {
             PyObject *item = va_arg(args, PyObject *);
             Py_ssize_t itemlen = PyUnicode_GET_LENGTH(item);
             if (itemlen != 0) {
+                // PyUnicode_CopyCharacters
                 _PyUnicode_FastCopyCharacters(res, res_offset, item, 0, itemlen);
                 res_offset += itemlen;
             }