Hide our handles and object layout from headers

Author: msimacek

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

@@ -12,27 +12,17 @@ typedef struct {
     double ob_fval;
 } PyFloatObject;
 
-// GraalPy addition
-typedef struct {
-    GraalPyObject ob_base;
-    double ob_fval;
-} GraalPyFloatObject;
-
 #define _PyFloat_CAST(op) \
     (assert(PyFloat_Check(op)), _Py_CAST(PyFloatObject*, op))
 
+// GraalPy public API
+PyAPI_FUNC(double) GraalPyFloat_AS_DOUBLE(PyObject* op);
+
 // Static inline version of PyFloat_AsDouble() trading safety for speed.
 // It doesn't check if op is a double object.
 static inline double PyFloat_AS_DOUBLE(PyObject *op) {
-#if 0 // GraalPy change
-    return _PyFloat_CAST(op)->ob_fval;
-#else // GraalPy change
-    if (points_to_py_handle_space(op)) {
-        return ((GraalPyFloatObject*) pointer_to_stub(op))->ob_fval;
-    } else {
-        return _PyFloat_CAST(op)->ob_fval;
-    }
-#endif // GraalPy change
+    // GraalPy change
+    return GraalPyFloat_AS_DOUBLE(op);
 }
 #define PyFloat_AS_DOUBLE(op) PyFloat_AS_DOUBLE(_PyObject_CAST(op))
 

graalpython/com.oracle.graal.python.cext/include/internal/pycore_gc.h

@@ -13,6 +13,9 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
+// GraalPy change
+#include "graalpy/handles.h"
+
 /* GC information is stored BEFORE the object structure. */
 typedef struct {
     // Pointer to next object in the list.

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

@@ -58,8 +58,6 @@ whose size is determined when the object is allocated.
 
 #include "pystats.h"
 
-#include "graalpy/handles.h"
-
 /* Py_DEBUG implies Py_REF_DEBUG. */
 #if defined(Py_DEBUG) && !defined(Py_REF_DEBUG)
 #  define Py_REF_DEBUG
@@ -1029,20 +1027,6 @@ static inline int PyType_CheckExact(PyObject *op) {
 #  define PyType_CheckExact(op) PyType_CheckExact(_PyObject_CAST(op))
 #endif
 
-// GraalPy additions
-PyAPI_FUNC(void) GraalPyPrivate_DebugTrace(void);
-
-typedef struct {
-    PyObject_HEAD
-    int32_t handle_table_index;
-} GraalPyObject;
-
-typedef struct {
-    GraalPyObject ob_base;
-    Py_ssize_t ob_size;
-    PyObject **ob_item;
-} GraalPyVarObject;
-
 #ifdef __cplusplus
 }
 #endif

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

@@ -83,6 +83,8 @@
 #include "pycore_global_objects.h" // _PY_NSMALLPOSINTS
 #include "pycore_gc.h" // PyGC_Head
 
+#include "graalpy/handles.h"
+
 #define SRC_CS "utf-8"
 
 /* Flags definitions representing global (debug) options. */
@@ -125,6 +127,24 @@ typedef struct {
     PyGC_Head *reachable;
 } GraalPyGC_Cycle;
 
+PyAPI_FUNC(void) GraalPyPrivate_DebugTrace(void);
+
+typedef struct {
+    PyObject_HEAD
+    int32_t handle_table_index;
+} GraalPyObject;
+
+typedef struct {
+    GraalPyObject ob_base;
+    Py_ssize_t ob_size;
+    PyObject **ob_item;
+} GraalPyVarObject;
+
+typedef struct {
+    GraalPyObject ob_base;
+    double ob_fval;
+} GraalPyFloatObject;
+
 typedef struct gc_generation GCGeneration;
 
 // {{start CAPI_BUILTINS}}

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

@@ -2659,6 +2659,14 @@ PyFloat_Unpack8(const char *data, int le)
 
 // GraalPy additions
 
+double GraalPyFloat_AS_DOUBLE(PyObject *op) {
+    if (points_to_py_handle_space(op)) {
+        return ((GraalPyFloatObject*) pointer_to_stub(op))->ob_fval;
+    } else {
+        return _PyFloat_CAST(op)->ob_fval;
+    }
+}
+
 // not quite as in CPython, this assumes that x is already a double. The rest of
 // the implementation is in the Float constructor in Java
 PyAPI_FUNC(PyObject*)