[GR-44984] Initial PyO3 support

PullRequest: graalpython/2824

Author: timfel

graalpython/com.oracle.graal.python.cext/src/bytearrayobject.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -47,6 +47,14 @@ char* _PyByteArray_Start(PyObject* obj) {
 	return PyByteArrayObject_ob_start(obj);
 }
 
+char* PyByteArray_AsString(PyObject* obj) {
+    return PyByteArray_AS_STRING(obj);
+}
+
+Py_ssize_t PyByteArray_Size(PyObject *self) {
+    return PyByteArray_GET_SIZE(self);
+}
+
 // taken from CPython 3.7.0 "Objects/bytearrayobject.c"
 int bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags) {
     void *ptr;

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -1565,6 +1565,10 @@ PyAPI_FUNC(PyObject*) PyDict_GetItem(PyObject* a, PyObject* b) {
 PyAPI_FUNC(PyObject*) PyDict_GetItemWithError(PyObject* a, PyObject* b) {
     return GraalPyDict_GetItemWithError(a, b);
 }
+#undef PyDict_Items
+PyAPI_FUNC(PyObject*) PyDict_Items(PyObject* a) {
+    return GraalPyDict_Items(a);
+}
 #undef PyDict_Keys
 PyAPI_FUNC(PyObject*) PyDict_Keys(PyObject* a) {
     return GraalPyDict_Keys(a);
@@ -1629,6 +1633,10 @@ PyAPI_FUNC(void) PyErr_Restore(PyObject* a, PyObject* b, PyObject* c) {
 PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject* a, PyObject* b, PyObject* c) {
     GraalPyErr_SetExcInfo(a, b, c);
 }
+#undef PyErr_WarnExplicit
+PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject* a, const char* b, const char* c, int d, const char* e, PyObject* f) {
+    return GraalPyErr_WarnExplicit(a, truffleString(b), truffleString(c), d, truffleString(e), f);
+}
 #undef PyEval_GetBuiltins
 PyAPI_FUNC(PyObject*) PyEval_GetBuiltins() {
     return GraalPyEval_GetBuiltins();
@@ -1641,6 +1649,10 @@ PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState* a) {
 PyAPI_FUNC(PyThreadState*) PyEval_SaveThread() {
     return GraalPyEval_SaveThread();
 }
+#undef PyException_GetCause
+PyAPI_FUNC(PyObject*) PyException_GetCause(PyObject* a) {
+    return GraalPyException_GetCause(a);
+}
 #undef PyException_GetContext
 PyAPI_FUNC(PyObject*) PyException_GetContext(PyObject* a) {
     return GraalPyException_GetContext(a);
@@ -2021,10 +2033,18 @@ PyAPI_FUNC(PyObject*) PySequence_Concat(PyObject* a, PyObject* b) {
 PyAPI_FUNC(int) PySequence_Contains(PyObject* a, PyObject* b) {
     return GraalPySequence_Contains(a, b);
 }
+#undef PySequence_Count
+PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject* a, PyObject* b) {
+    return GraalPySequence_Count(a, b);
+}
 #undef PySequence_DelItem
 PyAPI_FUNC(int) PySequence_DelItem(PyObject* a, Py_ssize_t b) {
     return GraalPySequence_DelItem(a, b);
 }
+#undef PySequence_DelSlice
+PyAPI_FUNC(int) PySequence_DelSlice(PyObject* a, Py_ssize_t b, Py_ssize_t c) {
+    return GraalPySequence_DelSlice(a, b, c);
+}
 #undef PySequence_GetItem
 PyAPI_FUNC(PyObject*) PySequence_GetItem(PyObject* a, Py_ssize_t b) {
     return GraalPySequence_GetItem(a, b);
@@ -2041,6 +2061,10 @@ PyAPI_FUNC(PyObject*) PySequence_InPlaceConcat(PyObject* a, PyObject* b) {
 PyAPI_FUNC(PyObject*) PySequence_InPlaceRepeat(PyObject* a, Py_ssize_t b) {
     return GraalPySequence_InPlaceRepeat(a, b);
 }
+#undef PySequence_Index
+PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject* a, PyObject* b) {
+    return GraalPySequence_Index(a, b);
+}
 #undef PySequence_Length
 PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject* a) {
     return GraalPySequence_Length(a);
@@ -2057,6 +2081,10 @@ PyAPI_FUNC(PyObject*) PySequence_Repeat(PyObject* a, Py_ssize_t b) {
 PyAPI_FUNC(int) PySequence_SetItem(PyObject* a, Py_ssize_t b, PyObject* c) {
     return GraalPySequence_SetItem(a, b, c);
 }
+#undef PySequence_SetSlice
+PyAPI_FUNC(int) PySequence_SetSlice(PyObject* a, Py_ssize_t b, Py_ssize_t c, PyObject* d) {
+    return GraalPySequence_SetSlice(a, b, c, d);
+}
 #undef PySequence_Size
 PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject* a) {
     return GraalPySequence_Size(a);
@@ -2197,6 +2225,10 @@ PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject* a) {
 PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject* a, PyTypeObject* b) {
     return GraalPyType_IsSubtype(a, b);
 }
+#undef PyUnicodeDecodeError_Create
+PyAPI_FUNC(PyObject*) PyUnicodeDecodeError_Create(const char* a, const char* b, Py_ssize_t c, Py_ssize_t d, Py_ssize_t e, const char* f) {
+    return GraalPyUnicodeDecodeError_Create(truffleString(a), b, c, d, e, truffleString(f));
+}
 #undef PyUnicode_AsEncodedString
 PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(PyObject* a, const char* b, const char* c) {
     return GraalPyUnicode_AsEncodedString(a, truffleString(b), truffleString(c));
@@ -2285,6 +2317,10 @@ PyAPI_FUNC(PyObject*) PyWeakref_NewRef(PyObject* a, PyObject* b) {
 PyAPI_FUNC(int) Py_AtExit(void (*a)(void)) {
     return GraalPy_AtExit(a);
 }
+#undef Py_CompileString
+PyAPI_FUNC(PyObject*) Py_CompileString(const char* a, const char* b, int c) {
+    return GraalPy_CompileString(truffleString(a), truffleString(b), c);
+}
 #undef Py_EnterRecursiveCall
 PyAPI_FUNC(int) Py_EnterRecursiveCall(const char* a) {
     return GraalPy_EnterRecursiveCall(a);

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -129,6 +129,7 @@ typedef struct {
     BUILTIN(PyDict_DelItem, int, PyObject*, PyObject*) \
     BUILTIN(PyDict_GetItem, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyDict_GetItemWithError, PyObject*, PyObject*, PyObject*) \
+    BUILTIN(PyDict_Items, PyObject*, PyObject*) \
     BUILTIN(PyDict_Keys, PyObject*, PyObject*) \
     BUILTIN(PyDict_Merge, int, PyObject*, PyObject*, int) \
     BUILTIN(PyDict_New, PyObject*) \
@@ -145,9 +146,11 @@ typedef struct {
     BUILTIN(PyErr_PrintEx, void, int) \
     BUILTIN(PyErr_Restore, void, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyErr_SetExcInfo, void, PyObject*, PyObject*, PyObject*) \
+    BUILTIN(PyErr_WarnExplicit, int, PyObject*, const char*, const char*, int, const char*, PyObject*) \
     BUILTIN(PyEval_GetBuiltins, PyObject*) \
     BUILTIN(PyEval_RestoreThread, void, PyThreadState*) \
     BUILTIN(PyEval_SaveThread, PyThreadState*) \
+    BUILTIN(PyException_GetCause, PyObject*, PyObject*) \
     BUILTIN(PyException_GetContext, PyObject*, PyObject*) \
     BUILTIN(PyException_SetCause, void, PyObject*, PyObject*) \
     BUILTIN(PyException_SetContext, void, PyObject*, PyObject*) \
@@ -243,15 +246,19 @@ typedef struct {
     BUILTIN(PySequence_Check, int, PyObject*) \
     BUILTIN(PySequence_Concat, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PySequence_Contains, int, PyObject*, PyObject*) \
+    BUILTIN(PySequence_Count, Py_ssize_t, PyObject*, PyObject*) \
     BUILTIN(PySequence_DelItem, int, PyObject*, Py_ssize_t) \
+    BUILTIN(PySequence_DelSlice, int, PyObject*, Py_ssize_t, Py_ssize_t) \
     BUILTIN(PySequence_GetItem, PyObject*, PyObject*, Py_ssize_t) \
     BUILTIN(PySequence_GetSlice, PyObject*, PyObject*, Py_ssize_t, Py_ssize_t) \
     BUILTIN(PySequence_InPlaceConcat, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PySequence_InPlaceRepeat, PyObject*, PyObject*, Py_ssize_t) \
+    BUILTIN(PySequence_Index, Py_ssize_t, PyObject*, PyObject*) \
     BUILTIN(PySequence_Length, Py_ssize_t, PyObject*) \
     BUILTIN(PySequence_List, PyObject*, PyObject*) \
     BUILTIN(PySequence_Repeat, PyObject*, PyObject*, Py_ssize_t) \
     BUILTIN(PySequence_SetItem, int, PyObject*, Py_ssize_t, PyObject*) \
+    BUILTIN(PySequence_SetSlice, int, PyObject*, Py_ssize_t, Py_ssize_t, PyObject*) \
     BUILTIN(PySequence_Size, Py_ssize_t, PyObject*) \
     BUILTIN(PySequence_Tuple, PyObject*, PyObject*) \
     BUILTIN(PySet_Add, int, PyObject*, PyObject*) \
@@ -374,6 +381,7 @@ typedef struct {
     BUILTIN(PyTuple_SetItem, int, PyObject*, Py_ssize_t, PyObject*) \
     BUILTIN(PyTuple_Size, Py_ssize_t, PyObject*) \
     BUILTIN(PyType_IsSubtype, int, PyTypeObject*, PyTypeObject*) \
+    BUILTIN(PyUnicodeDecodeError_Create, PyObject*, const char*, const char*, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char*) \
     BUILTIN(PyUnicode_AsEncodedString, PyObject*, PyObject*, const char*, const char*) \
     BUILTIN(PyUnicode_AsUnicodeEscapeString, PyObject*, PyObject*) \
     BUILTIN(PyUnicode_Compare, int, PyObject*, PyObject*) \
@@ -396,6 +404,7 @@ typedef struct {
     BUILTIN(PyWeakref_GetObject, PyObject*, PyObject*) \
     BUILTIN(PyWeakref_NewRef, PyObject*, PyObject*, PyObject*) \
     BUILTIN(Py_AtExit, int, void (*)(void)) \
+    BUILTIN(Py_CompileString, PyObject*, const char*, const char*, int) \
     BUILTIN(Py_EnterRecursiveCall, int, const char*) \
     BUILTIN(Py_GenericAlias, PyObject*, PyObject*, PyObject*) \
     BUILTIN(Py_LeaveRecursiveCall, void) \

graalpython/com.oracle.graal.python.cext/src/exceptions.c

@@ -112,6 +112,7 @@ PyObject * PyExc_FutureWarning = NULL;
 PyObject * PyExc_ImportWarning = NULL;
 PyObject * PyExc_UnicodeWarning = NULL;
 PyObject * PyExc_BytesWarning = NULL;
+PyObject * PyExc_EncodingWarning = NULL;
 PyObject * PyExc_ResourceWarning = NULL;
 
 void initialize_exceptions() {
@@ -182,6 +183,7 @@ void initialize_exceptions() {
     PyExc_ImportWarning = PY_EXCEPTION("ImportWarning");
     PyExc_UnicodeWarning = PY_EXCEPTION("UnicodeWarning");
     PyExc_BytesWarning = PY_EXCEPTION("BytesWarning");
+    PyExc_EncodingWarning = PY_EXCEPTION("EncodingWarning");
     PyExc_ResourceWarning = PY_EXCEPTION("ResourceWarning");
 }
 

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

@@ -1723,9 +1723,6 @@ PyAPI_FUNC(Py_ssize_t) PyBuffer_SizeFromFormat(const char* a) {
 PyAPI_FUNC(int) PyBuffer_ToContiguous(void* a, Py_buffer* b, Py_ssize_t c, char d) {
     unimplemented("PyBuffer_ToContiguous"); exit(-1);
 }
-PyAPI_FUNC(char*) PyByteArray_AsString(PyObject* a) {
-    unimplemented("PyByteArray_AsString"); exit(-1);
-}
 PyAPI_FUNC(PyObject*) PyByteArray_Concat(PyObject* a, PyObject* b) {
     unimplemented("PyByteArray_Concat"); exit(-1);
 }
@@ -1741,9 +1738,6 @@ PyAPI_FUNC(int) PyByteArray_Resize(PyObject* a, Py_ssize_t b) {
     int result = (int) GraalPyByteArray_Resize(a, b);
     return result;
 }
-PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject* a) {
-    unimplemented("PyByteArray_Size"); exit(-1);
-}
 char* (*__target__PyBytes_AsString)(PyObject*) = NULL;
 PyAPI_FUNC(char*) PyBytes_AsString(PyObject* a) {
     char* result = (char*) __target__PyBytes_AsString(a);
@@ -2112,7 +2106,8 @@ PyAPI_FUNC(PyObject*) PyDict_GetItemWithError(PyObject* a, PyObject* b) {
     return result;
 }
 PyAPI_FUNC(PyObject*) PyDict_Items(PyObject* a) {
-    unimplemented("PyDict_Items"); exit(-1);
+    PyObject* result = (PyObject*) GraalPyDict_Items(a);
+    return result;
 }
 PyAPI_FUNC(PyObject*) PyDict_Keys(PyObject* a) {
     PyObject* result = (PyObject*) GraalPyDict_Keys(a);
@@ -2290,8 +2285,10 @@ PyAPI_FUNC(void) PyErr_SyntaxLocationEx(const char* a, int b, int c) {
 PyAPI_FUNC(void) PyErr_SyntaxLocationObject(PyObject* a, int b, int c) {
     unimplemented("PyErr_SyntaxLocationObject"); exit(-1);
 }
+int (*__target__PyErr_WarnExplicit)(PyObject*, const char*, const char*, int, const char*, PyObject*) = NULL;
 PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject* a, const char* b, const char* c, int d, const char* e, PyObject* f) {
-    unimplemented("PyErr_WarnExplicit"); exit(-1);
+    int result = (int) __target__PyErr_WarnExplicit(a, b, c, d, e, f);
+    return result;
 }
 PyAPI_FUNC(int) PyErr_WarnExplicitFormat(PyObject* a, const char* b, int c, const char* d, PyObject* e, const char* f, ...) {
     unimplemented("PyErr_WarnExplicitFormat"); exit(-1);
@@ -2392,7 +2389,8 @@ PyAPI_FUNC(const char*) PyExceptionClass_Name(PyObject* a) {
     unimplemented("PyExceptionClass_Name"); exit(-1);
 }
 PyAPI_FUNC(PyObject*) PyException_GetCause(PyObject* a) {
-    unimplemented("PyException_GetCause"); exit(-1);
+    PyObject* result = (PyObject*) GraalPyException_GetCause(a);
+    return result;
 }
 PyAPI_FUNC(PyObject*) PyException_GetContext(PyObject* a) {
     PyObject* result = (PyObject*) GraalPyException_GetContext(a);
@@ -3533,14 +3531,16 @@ PyAPI_FUNC(int) PySequence_Contains(PyObject* a, PyObject* b) {
     return result;
 }
 PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject* a, PyObject* b) {
-    unimplemented("PySequence_Count"); exit(-1);
+    Py_ssize_t result = (Py_ssize_t) GraalPySequence_Count(a, b);
+    return result;
 }
 PyAPI_FUNC(int) PySequence_DelItem(PyObject* a, Py_ssize_t b) {
     int result = (int) GraalPySequence_DelItem(a, b);
     return result;
 }
 PyAPI_FUNC(int) PySequence_DelSlice(PyObject* a, Py_ssize_t b, Py_ssize_t c) {
-    unimplemented("PySequence_DelSlice"); exit(-1);
+    int result = (int) GraalPySequence_DelSlice(a, b, c);
+    return result;
 }
 PyObject* (*__target__PySequence_Fast)(PyObject*, const char*) = NULL;
 PyAPI_FUNC(PyObject*) PySequence_Fast(PyObject* a, const char* b) {
@@ -3567,7 +3567,8 @@ PyAPI_FUNC(PyObject*) PySequence_InPlaceRepeat(PyObject* a, Py_ssize_t b) {
     return result;
 }
 PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject* a, PyObject* b) {
-    unimplemented("PySequence_Index"); exit(-1);
+    Py_ssize_t result = (Py_ssize_t) GraalPySequence_Index(a, b);
+    return result;
 }
 PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject* a) {
     Py_ssize_t result = (Py_ssize_t) GraalPySequence_Length(a);
@@ -3586,7 +3587,8 @@ PyAPI_FUNC(int) PySequence_SetItem(PyObject* a, Py_ssize_t b, PyObject* c) {
     return result;
 }
 PyAPI_FUNC(int) PySequence_SetSlice(PyObject* a, Py_ssize_t b, Py_ssize_t c, PyObject* d) {
-    unimplemented("PySequence_SetSlice"); exit(-1);
+    int result = (int) GraalPySequence_SetSlice(a, b, c, d);
+    return result;
 }
 PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject* a) {
     Py_ssize_t result = (Py_ssize_t) GraalPySequence_Size(a);
@@ -4037,8 +4039,10 @@ PyAPI_FUNC(int) PyType_Ready(PyTypeObject* a) {
     int result = (int) __target__PyType_Ready(a);
     return result;
 }
+PyObject* (*__target__PyUnicodeDecodeError_Create)(const char*, const char*, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char*) = NULL;
 PyAPI_FUNC(PyObject*) PyUnicodeDecodeError_Create(const char* a, const char* b, Py_ssize_t c, Py_ssize_t d, Py_ssize_t e, const char* f) {
-    unimplemented("PyUnicodeDecodeError_Create"); exit(-1);
+    PyObject* result = (PyObject*) __target__PyUnicodeDecodeError_Create(a, b, c, d, e, f);
+    return result;
 }
 PyAPI_FUNC(PyObject*) PyUnicodeDecodeError_GetEncoding(PyObject* a) {
     unimplemented("PyUnicodeDecodeError_GetEncoding"); exit(-1);
@@ -4528,8 +4532,10 @@ PyAPI_FUNC(int) Py_AtExit(void (*a)(void)) {
 PyAPI_FUNC(int) Py_BytesMain(int a, char** b) {
     unimplemented("Py_BytesMain"); exit(-1);
 }
+PyObject* (*__target__Py_CompileString)(const char*, const char*, int) = NULL;
 PyAPI_FUNC(PyObject*) Py_CompileString(const char* a, const char* b, int c) {
-    unimplemented("Py_CompileString"); exit(-1);
+    PyObject* result = (PyObject*) __target__Py_CompileString(a, b, c);
+    return result;
 }
 PyAPI_FUNC(PyObject*) Py_CompileStringExFlags(const char* a, const char* b, int c, PyCompilerFlags* d, int e) {
     unimplemented("Py_CompileStringExFlags"); exit(-1);
@@ -6248,6 +6254,7 @@ void initializeCAPIForwards(void* (*getAPI)(const char*)) {
     __target__PyErr_SetNone = getAPI("PyErr_SetNone");
     __target__PyErr_SetObject = getAPI("PyErr_SetObject");
     __target__PyErr_SetString = getAPI("PyErr_SetString");
+    __target__PyErr_WarnExplicit = getAPI("PyErr_WarnExplicit");
     __target__PyErr_WriteUnraisable = getAPI("PyErr_WriteUnraisable");
     __target__PyEval_CallObjectWithKeywords = getAPI("PyEval_CallObjectWithKeywords");
     __target__PyEval_EvalCode = getAPI("PyEval_EvalCode");
@@ -6372,6 +6379,7 @@ void initializeCAPIForwards(void* (*getAPI)(const char*)) {
     __target__PyType_GetSlot = getAPI("PyType_GetSlot");
     __target__PyType_Modified = getAPI("PyType_Modified");
     __target__PyType_Ready = getAPI("PyType_Ready");
+    __target__PyUnicodeDecodeError_Create = getAPI("PyUnicodeDecodeError_Create");
     __target__PyUnicode_Append = getAPI("PyUnicode_Append");
     __target__PyUnicode_AppendAndDel = getAPI("PyUnicode_AppendAndDel");
     __target__PyUnicode_AsASCIIString = getAPI("PyUnicode_AsASCIIString");
@@ -6406,6 +6414,7 @@ void initializeCAPIForwards(void* (*getAPI)(const char*)) {
     __target__PyUnicode_InternInPlace = getAPI("PyUnicode_InternInPlace");
     __target__PyUnicode_New = getAPI("PyUnicode_New");
     __target__PyVectorcall_Call = getAPI("PyVectorcall_Call");
+    __target__Py_CompileString = getAPI("Py_CompileString");
     __target__Py_GetBuildInfo = getAPI("Py_GetBuildInfo");
     __target__Py_GetCompiler = getAPI("Py_GetCompiler");
     __target__Py_GetVersion = getAPI("Py_GetVersion");