[GR-65639] Safe upcall and read ob_fval value directly from our stubs.

Author: timfel

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2023, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2023 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -12,6 +12,12 @@ 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))
 
@@ -21,7 +27,11 @@ static inline double PyFloat_AS_DOUBLE(PyObject *op) {
 #if 0 // GraalPy change
     return _PyFloat_CAST(op)->ob_fval;
 #else // GraalPy change
-    return PyFloat_AsDouble(op);
+    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
 }
 #define PyFloat_AS_DOUBLE(op) PyFloat_AS_DOUBLE(_PyObject_CAST(op))

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

@@ -1036,8 +1036,20 @@ static inline int PyType_CheckExact(PyObject *op) {
 #  define PyType_CheckExact(op) PyType_CheckExact(_PyObject_CAST(op))
 #endif
 
+// GraalPy additions
 PyAPI_FUNC(void) _PyTruffle_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

@@ -112,22 +112,6 @@ typedef struct {
     int getter_doc;
 } propertyobject;
 
-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;
-
 /* GraalPy GC support */
 
 typedef struct _cycle_node {

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -308,20 +308,6 @@ float_dealloc(PyObject *op)
 double
 PyFloat_AsDouble(PyObject *op)
 {
-    // GraalPy change: read from native object stub or upcall for managed
-    if (points_to_py_handle_space(op)) {
-        if (PyFloat_Check(op)) {
-            double val = ((GraalPyFloatObject*) pointer_to_stub(op))->ob_fval;
-#ifndef NDEBUG
-            if (PyTruffle_Debug_CAPI() && GraalPyTruffleFloat_AsDouble(op) != val) {
-                Py_FatalError("ob_size of native stub and managed object differ");
-            }
-#endif
-            return val;
-        }
-        return GraalPyTruffleFloat_AsDouble(op);
-    }
-
     PyNumberMethods *nb;
     PyObject *res;
     double val;
@@ -332,8 +318,12 @@ PyFloat_AsDouble(PyObject *op)
     }
 
     if (PyFloat_Check(op)) {
-        // GraalPy change: avoid macro recursion
-        return ((PyFloatObject*) op)->ob_fval;
+        return PyFloat_AS_DOUBLE(op);
+    }
+
+    // GraalPy change: upcall for managed
+    if (points_to_py_handle_space(op)) {
+        return GraalPyTruffleFloat_AsDouble(op);
     }
 
     nb = Py_TYPE(op)->tp_as_number;
@@ -374,8 +364,7 @@ PyFloat_AsDouble(PyObject *op)
         }
     }
 
-    // GraalPy change: avoid macro recursion
-    val = PyFloat_AsDouble(res);
+    val = PyFloat_AS_DOUBLE(res);
     Py_DECREF(res);
     return val;
 }