[GR-53369] Fixes for optuna

PullRequest: graalpython/3310

Author: msimacek

graalpython/com.oracle.graal.python.test.integration/src/com/oracle/graal/python/test/integration/basic/AttributeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -143,9 +143,11 @@ public void delMagicAttribute() {
 
     @Test
     public void complexHasDoc() {
-        PythonTests.assertPrints("complex(real[, imag]) -> complex number\n\n" +
-                        "Create a complex number from a real part and an optional imaginary part.\n" +
-                        "This is equivalent to (real + imag*1j) where imag defaults to 0.\n",
+        PythonTests.assertPrints("""
+                        Create a complex number from a real part and an optional imaginary part.
+
+                        This is equivalent to (real + imag*1j) where imag defaults to 0.
+                        """,
                         "print(complex.__doc__)");
     }
 }

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_tp_slots.py

@@ -37,7 +37,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 import sys
-from . import CPyExtType, CPyExtHeapType
+from . import CPyExtType, CPyExtHeapType, compile_module_from_string
 
 SlotsGetter = CPyExtType("SlotsGetter",
                          """
@@ -245,3 +245,43 @@ class MyClassWithDescr2:
         # assert SlotsGetter.get_tp_descr_get(HackySlotsWithManaged()) == SlotsGetter.get_tp_attro(ManagedAttrO())
     finally:
         sys.modules.pop("test_incompatible_slots_assignment_managed", None)
+
+
+def test_type_not_ready():
+    module = compile_module_from_string("""
+        #define PY_SSIZE_T_CLEAN
+        #include <Python.h>
+        
+        static PyObject* my_getattro(PyObject* self, PyObject* key) {
+            return Py_NewRef(key);
+        }
+        
+        static PyTypeObject NotReadyType = {
+            PyVarObject_HEAD_INIT(NULL, 0)
+            .tp_name = "NotReadyType",
+            .tp_basicsize = sizeof(PyObject),
+            .tp_dealloc = (destructor)PyObject_Del,
+            .tp_getattro = my_getattro
+        };
+        
+        static PyObject* create_not_ready(PyObject* module, PyObject* unused) {
+            return PyObject_New(PyObject, &NotReadyType);
+        }
+        
+        static PyMethodDef module_methods[] = {
+            {"create_not_ready", _PyCFunction_CAST(create_not_ready), METH_NOARGS, ""},
+            {NULL}
+        };
+        
+        static PyModuleDef NotReadyTypeModule = {
+            PyModuleDef_HEAD_INIT, "NotReadyType", "", -1, module_methods
+        };
+    
+        PyMODINIT_FUNC
+        PyInit_NotReadyType(void)
+        {
+            return PyModule_Create(&NotReadyTypeModule);
+        }
+    """, "NotReadyType")
+    not_ready = module.create_not_ready()
+    assert not_ready.foo == 'foo'

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -1560,7 +1560,7 @@ Object doNonWrapper(long pointer, boolean stealing,
                     Object ref = lookup.get();
                     if (createNativeProfile.profile(inliningTarget, ref == null)) {
                         LOGGER.fine(() -> "re-creating collected PythonAbstractNativeObject reference" + Long.toHexString(pointer));
-                        return createAbstractNativeObject(nativeContext, pointer, stealing, pointer);
+                        return createAbstractNativeObject(nativeContext, new NativePointer(pointer), stealing, pointer);
                     }
                     if (isNativeWrapperProfile.profile(inliningTarget, ref instanceof PythonNativeWrapper)) {
                         wrapper = (PythonNativeWrapper) ref;
@@ -1572,7 +1572,7 @@ Object doNonWrapper(long pointer, boolean stealing,
                         return result;
                     }
                 } else {
-                    return createAbstractNativeObject(nativeContext, pointer, stealing, pointer);
+                    return createAbstractNativeObject(nativeContext, new NativePointer(pointer), stealing, pointer);
                 }
             }
             return NativeToPythonNode.handleWrapper(inliningTarget, wrapperProfile, stealing, wrapper);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

@@ -27,7 +27,6 @@
 
 import static com.oracle.graal.python.nodes.BuiltinNames.J_APPEND;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_EXTEND;
-import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J_SORT;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___CLASS_GETITEM__;
@@ -146,11 +145,6 @@ public final class ListBuiltins extends PythonBuiltins {
     @Override
     public void initialize(Python3Core core) {
         super.initialize(core);
-        addBuiltinConstant(T___DOC__, //
-                        "Built-in mutable sequence.\n" + //
-                                        "\n" + //
-                                        "If no argument is given, the constructor creates a new empty list.\n" + //
-                                        "The argument must be an iterable if specified.");
         this.addBuiltinConstant(T___HASH__, PNone.NONE);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java

@@ -103,6 +103,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.graal.python.util.InlineWeakValueProfile;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Cached;
@@ -115,6 +116,7 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 
 /**
@@ -954,8 +956,27 @@ static TpSlots doManaged(PythonManagedClass klass) {
         }
 
         @Specialization
-        static TpSlots doNative(PythonAbstractNativeObject nativeKlass) {
-            return nativeKlass.getTpSlots();
+        static TpSlots doNative(Node inliningTarget, PythonAbstractNativeObject nativeKlass,
+                        @Cached InlinedBranchProfile slotsNotInitializedProfile) {
+            TpSlots tpSlots = nativeKlass.getTpSlots();
+            if (CompilerDirectives.injectBranchProbability(CompilerDirectives.SLOWPATH_PROBABILITY, tpSlots == null)) {
+                /*
+                 * This happens when we try to get slots of a type that didn't go through
+                 * PyType_Ready yet. Specifically, numpy has a "fortran" type (defined in
+                 * `fortranobject.c`) that they never ready and just expect it to work because it's
+                 * simple. So just do the minimum to make the slots available.
+                 */
+                slotsNotInitializedProfile.enter(inliningTarget);
+                tpSlots = initializeNativeSlots(nativeKlass);
+            }
+            return tpSlots;
+        }
+
+        @TruffleBoundary
+        private static TpSlots initializeNativeSlots(PythonAbstractNativeObject nativeKlass) {
+            TpSlots tpSlots = TpSlots.fromNative(nativeKlass, PythonContext.get(null));
+            nativeKlass.setTpSlots(tpSlots);
+            return tpSlots;
         }
     }