Directly access ob_type in Py_TYPE

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/graalpy/handles.h

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024, 2024, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef SRC_HANDLES_H_
+#define SRC_HANDLES_H_
+
+#include <object.h>
+
+#define MANAGED_REFCNT 10
+#define HANDLE_BASE 0x8000000000000000ULL
+#define IMMORTAL_REFCNT (INT64_MAX >> 1)
+
+#ifdef GRAALVM_PYTHON_LLVM_MANAGED
+#include <graalvm/llvm/polyglot.h>
+#define points_to_py_handle_space(PTR) polyglot_is_value((PTR))
+#define stub_to_pointer(STUB_PTR) (STUB_PTR)
+#define pointer_to_stub(O) (O)
+#else /* GRAALVM_PYTHON_LLVM_MANAGED */
+
+#define points_to_py_handle_space(PTR) ((((uintptr_t) (PTR)) & HANDLE_BASE) != 0)
+#define stub_to_pointer(STUB_PTR) (((uintptr_t) (STUB_PTR)) | HANDLE_BASE)
+#define pointer_to_stub(PTR) ((PyObject *)(((uintptr_t) (PTR)) & ~HANDLE_BASE))
+
+#endif /* GRAALVM_PYTHON_LLVM_MANAGED */
+
+#endif /* SRC_HANDLES_H_ */

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -57,6 +57,8 @@ A standard interface exists for objects that contain an array of items
 whose size is determined when the object is allocated.
 */
 
+#include "graalpy/handles.h"
+
 /* Py_DEBUG implies Py_REF_DEBUG. */
 #if defined(Py_DEBUG) && !defined(Py_REF_DEBUG)
 #  define Py_REF_DEBUG
@@ -135,10 +137,14 @@ PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y);
 PyAPI_FUNC(Py_ssize_t) _Py_REFCNT(const PyObject *ob);
 #define Py_REFCNT(ob) _Py_REFCNT(_PyObject_CAST_CONST(ob))
 
-
 PyAPI_FUNC(PyTypeObject*) _Py_TYPE(const PyObject *ob);
+
 // bpo-39573: The Py_SET_TYPE() function must be used to set an object type.
+#if defined(GRAALVM_PYTHON_LLVM_MANAGED) || !defined(NDEBUG)
 #define Py_TYPE(ob)             _Py_TYPE(_PyObject_CAST_CONST(ob))
+#else
+#define Py_TYPE(ob)             (pointer_to_stub(ob)->ob_type)
+#endif
 
 PyAPI_FUNC(Py_ssize_t) _Py_SIZE(const PyVarObject *ob);
 // bpo-39573: The Py_SET_SIZE() function must be used to set an object size.

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

@@ -801,27 +801,6 @@ static inline int get_method_flags_wrapper(int flags) {
     return JWRAPPER_UNSUPPORTED;
 }
 
-#define MANAGED_REFCNT 10
-#define HANDLE_BASE 0x8000000000000000ULL
-#define IMMORTAL_REFCNT (INT64_MAX >> 1)
-
-#ifdef GRAALVM_PYTHON_LLVM_MANAGED
-#define points_to_py_handle_space(PTR) polyglot_is_value((PTR))
-#else /* GRAALVM_PYTHON_LLVM_MANAGED */
-
-#define points_to_py_handle_space(PTR) ((((uintptr_t) (PTR)) & HANDLE_BASE) != 0)
-
-static MUST_INLINE PyObject *stub_to_pointer(PyObject *stub_ptr)
-{
-    return ((uintptr_t) stub_ptr) | HANDLE_BASE;
-}
-
-static MUST_INLINE PyObject *pointer_to_stub(PyObject *o)
-{
-    return ((uintptr_t) o) & ~HANDLE_BASE;
-}
-#endif /* GRAALVM_PYTHON_LLVM_MANAGED */
-
 void register_native_slots(PyTypeObject* managed_class, PyGetSetDef* getsets, PyMemberDef* members);
 
 // export the SizeT arg parse functions, because we use them in contrast to cpython on windows for core modules that we link dynamically