[GR-40247] New Implementation of C API that allows native execution.

PullRequest: graalpython/2614

Author: fangerer

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "47faab4012b93d0636f07508400d8ef7ed55479b" }
+{ "overlay": "f43588af9b5811c0c72177d07093606797b2e34e" }

graalpython/com.oracle.graal.python.cext/CAPIFunctions.txt

@@ -80,7 +80,7 @@ POLYGLOT_DECLARE_TYPE(wchar_t)
 POLYGLOT_DECLARE_TYPE(HPyType_Spec)
 POLYGLOT_DECLARE_TYPE(HPyType_SpecParam)
 
-int graal_hpy_init(HPyContext *context, void *initObject) {
+int Py_EXPORTED_SYMBOL graal_hpy_init(HPyContext *context, void *initObject) {
 	// save context in global for NFI upcalls
 	g_universal_ctx = context;
 

graalpython/com.oracle.graal.python.cext/hpy/hpy.c

@@ -10,6 +10,10 @@
 /* Include nearly all Python header files */
 
 #include "patchlevel.h"
+
+// can be used to bulk-rename fields, e.g., by concatenating "_internal"
+#define Py_HIDE_IMPL_FIELD(name) name
+
 #include "pyconfig.h"
 
 #include <limits.h>
@@ -141,4 +145,7 @@
 #include "cpython/pyfpe.h"
 #include "tracemalloc.h"
 
+// helper macro for quick printf debugging
+#define __PD {printf("%i \t%s\n", __LINE__, __func__); }
+
 #endif /* !Py_PYTHON_H */

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -729,11 +729,11 @@ PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
 #define PySequence_Fast_GET_ITEM(o, i)\
      (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
 
+PyAPI_FUNC(PyObject **) _PySequence_Fast_ITEMS(PyObject *o);
+
 /* Return a pointer to the underlying item array for
    an object returned by PySequence_Fast */
-#define PySequence_Fast_ITEMS(sf) \
-    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
-                      : ((PyTupleObject *)(sf))->ob_item)
+#define PySequence_Fast_ITEMS(sf) _PySequence_Fast_ITEMS(sf)
 
 /* Return the number of occurrences on value on 'o', that is, return
    the number of keys for which o[key] == value.
@@ -866,6 +866,12 @@ PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
 /* issubclass(object, typeorclass) */
 PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
 
+
+/* GraalPy-specific API */
+PyAPI_FUNC(const char*) PyObject_GetDoc(PyObject* object);
+
+PyAPI_FUNC(int) PyObject_SetDoc(PyObject* object, const char* doc);
+
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_ABSTRACTOBJECT_H
 #  include  "cpython/abstract.h"

graalpython/com.oracle.graal.python.cext/include/abstract.h

@@ -33,10 +33,8 @@ PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
 
 /* Macros for direct access to these values. Type checks are *not*
    done, so use with care. */
-#define PyMethod_GET_FUNCTION(meth) \
-        (((PyMethodObject *)meth) -> im_func)
-#define PyMethod_GET_SELF(meth) \
-        (((PyMethodObject *)meth) -> im_self)
+#define PyMethod_GET_FUNCTION(meth) PyMethod_Function((PyObject*)(meth))
+#define PyMethod_GET_SELF(meth) PyMethod_Self((PyObject*)(meth))
 
 typedef struct {
     PyObject_HEAD
@@ -52,8 +50,7 @@ PyAPI_FUNC(PyObject *) PyInstanceMethod_Function(PyObject *);
 
 /* Macros for direct access to these values. Type checks are *not*
    done, so use with care. */
-#define PyInstanceMethod_GET_FUNCTION(meth) \
-        (((PyInstanceMethodObject *)meth) -> func)
+#define PyInstanceMethod_GET_FUNCTION(meth) PyInstanceMethod_Function((PyObject*)(meth))
 
 #ifdef __cplusplus
 }

graalpython/com.oracle.graal.python.cext/include/classobject.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -331,10 +331,11 @@ PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
 
 /* === Sequence protocol ================================================ */
 
+PyAPI_FUNC(PyObject*) _PySequence_ITEM(PyObject* obj, Py_ssize_t index);
+
 /* Assume tp_as_sequence and sq_item exist and that 'i' does not
    need to be corrected for a negative index. */
-#define PySequence_ITEM(o, i)\
-    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) )
+#define PySequence_ITEM(o, i) _PySequence_ITEM((o), (i))
 
 #define PY_ITERSEARCH_COUNT    1
 #define PY_ITERSEARCH_INDEX    2

graalpython/com.oracle.graal.python.cext/include/cpython/abstract.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -16,10 +16,12 @@ typedef struct {
     Py_ssize_t ob_exports; /* How many buffer exports */
 } PyByteArrayObject;
 
+PyAPI_FUNC(char*) _PyByteArray_Start(PyObject*);
+
 /* Macros, trading safety for speed */
 #define PyByteArray_AS_STRING(self) \
     (assert(PyByteArray_Check(self)), \
-     Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_start : _PyByteArray_empty_string)
+     Py_SIZE(self) ? _PyByteArray_Start((PyObject *)self) : _PyByteArray_empty_string)
 #define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)), Py_SIZE(self))
 
 PyAPI_DATA(char) _PyByteArray_empty_string[];

graalpython/com.oracle.graal.python.cext/include/cpython/bytearrayobject.h

@@ -45,8 +45,7 @@
 typedef struct {
     PyObject_VAR_HEAD
     Py_hash_t ob_shash;
-    // Truffle change: char ob_sval[1] doesn't work for us in Sulong
-    char *ob_sval;
+    char Py_HIDE_IMPL_FIELD(ob_sval)[1];
 
     /* Invariants:
      *     ob_sval contains space for 'ob_size+1' elements.
@@ -70,8 +69,7 @@ PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t,
                                              const char *, const char **);
 
 /* Macro, trading safety for speed */
-#define PyBytes_AS_STRING(op) (assert(PyBytes_Check(op)), \
-                                (((PyBytesObject *)(op))->ob_sval))
+#define PyBytes_AS_STRING(op) (PyBytes_AsString((PyObject*) (op)))
 #define PyBytes_GET_SIZE(op)  (assert(PyBytes_Check(op)),Py_SIZE(op))
 
 /* _PyBytes_Join(sep, x) is like sep.join(x).  sep must be PyBytesObject*,

graalpython/com.oracle.graal.python.cext/include/cpython/bytesobject.h

@@ -50,7 +50,7 @@ PyAPI_FUNC(int) _PyDict_Next(
     PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);
 
 /* Get the number of items of a dictionary. */
-#define PyDict_GET_SIZE(mp)  (assert(PyDict_Check(mp)),((PyDictObject *)mp)->ma_used)
+#define PyDict_GET_SIZE(mp)  (assert(PyDict_Check(mp)),PyObject_Size((PyObject*) mp))
 PyAPI_FUNC(int) _PyDict_Contains_KnownHash(PyObject *, PyObject *, Py_hash_t);
 PyAPI_FUNC(int) _PyDict_ContainsId(PyObject *, struct _Py_Identifier *);
 PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);