[GR-52612] check __new__ against requested name of builtin annotations

qunaibit · qunaibit · commit 991989e85df2 · 2024-03-16T15:22:17.000Z
PullRequest: graalpython/3239
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -984,11 +984,12 @@ static void print_c_stacktrace() {
 #endif
 
 static void unimplemented(const char* name) {
+    printf("Function not implemented in GraalPy: %s\n", name);
     printf("Native stacktrace:\n");
     print_c_stacktrace();
 }
 
-#define FUNC_NOT_IMPLEMENTED unimplemented(__func__); GraalPyTrufflePrintStacktrace(__func__, "Function not implemented in GraalPy: "); exit(-1);
+#define FUNC_NOT_IMPLEMENTED unimplemented(__func__); GraalPyTrufflePrintStacktrace(); exit(-1);
 
 // {{start CAPI_BUILTINS}}
 #include "capi.gen.c.h"
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.h b/graalpython/com.oracle.graal.python.cext/src/capi.h
@@ -408,6 +408,7 @@ EXCEPTION(ArithmeticError) \
 EXCEPTION(AssertionError) \
 EXCEPTION(AttributeError) \
 EXCEPTION(BaseException) \
+EXCEPTION(BaseExceptionGroup) \
 EXCEPTION(BlockingIOError) \
 EXCEPTION(BrokenPipeError) \
 EXCEPTION(BufferError) \
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py b/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py
@@ -541,6 +541,19 @@ def test_new(self):
         tester = TestNew()
         assert tester.get_none() is None
 
+    def test_object_new_m_ml(self):
+        ObjectNew = CPyExtType("ObjectNew_", 
+                            '''
+                            static PyObject* get_flags(PyObject* cls, PyObject* func) {
+                                return PyLong_FromLong(PyCFunction_GetFlags(func));
+                            }
+
+                            ''',
+                            tp_methods='''{"get_flags", (PyCFunction)get_flags, METH_O | METH_CLASS, ""}''',
+                            )
+        f = ObjectNew.get_flags(object.__new__)
+        assert f == 3, "PyCFunction_GetFlags(object.__new__) 3 != %d" % f
+
     def test_init(self):
         TestInit = CPyExtType("TestInit", 
                              '''static PyObject* testnew_new(PyTypeObject* cls, PyObject* a, PyObject* b) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextContextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextContextBuiltins.java
@@ -53,6 +53,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiNullaryBuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiTernaryBuiltinNode;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PRaiseNativeNode;
@@ -71,13 +72,12 @@
 
 public final class PythonCextContextBuiltins {
 
-    @CApiBuiltin(ret = VoidNoReturn, args = {ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString}, call = Ignored)
-    abstract static class PyTrufflePrintStacktrace extends CApiBinaryBuiltinNode {
+    @CApiBuiltin(ret = VoidNoReturn, args = {}, call = Ignored)
+    abstract static class PyTrufflePrintStacktrace extends CApiNullaryBuiltinNode {
 
         @Specialization
         @TruffleBoundary
-        static Object stacktrace(TruffleString where, TruffleString msg) {
-            System.err.println(msg.toJavaStringUncached() + where.toJavaStringUncached());
+        static Object stacktrace() {
             printPythonLikeStackTrace();
             return 0;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/hashlib/HashlibModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/hashlib/HashlibModuleBuiltins.java
@@ -256,7 +256,7 @@ static Object hmacDigest(VirtualFrame frame, PythonModule self, Object key, Obje
                         @Cached PRaiseNode.Lazy raiseNode) {
             if (msg instanceof PNone) {
                 // hmac_digest is a bit more strict
-                throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P, msg);
+                throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.BYTESLIKE_OBJ_REQUIRED, msg);
             }
             Object hmacObject = newNode.execute(frame, self, key, msg, digest);
             return digestNode.execute(frame, hmacObject);
@@ -311,7 +311,7 @@ static Object hmacNew(@SuppressWarnings("unused") PythonModule self, Object keyO
             TruffleString digestmod = castStr.execute(inliningTarget, digestmodObj);
             Object key;
             if (!acquireLib.hasBuffer(keyObj)) {
-                throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P, keyObj);
+                throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.BYTESLIKE_OBJ_REQUIRED, keyObj);
             } else {
                 key = acquireLib.acquireReadonly(keyObj);
             }
@@ -322,7 +322,7 @@ static Object hmacNew(@SuppressWarnings("unused") PythonModule self, Object keyO
                 } else if (acquireLib.hasBuffer(msgObj)) {
                     msg = acquireLib.acquireReadonly(msgObj);
                 } else {
-                    throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P, msgObj);
+                    throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.BYTESLIKE_OBJ_REQUIRED, msgObj);
                 }
                 try {
                     byte[] msgBytes = msg == null ? null : bufferLib.getInternalOrCopiedByteArray(msg);
@@ -374,7 +374,7 @@ static Object doIt(VirtualFrame frame, Node inliningTarget, PythonBuiltinClassTy
             } else if (acquireLib.hasBuffer(value)) {
                 buffer = acquireLib.acquireReadonly(value, frame, indirectCallData);
             } else {
-                throw raise.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P, value);
+                throw raise.get(inliningTarget).raise(PythonBuiltinClassType.TypeError, ErrorMessages.BYTESLIKE_OBJ_REQUIRED, value);
             }
             try {
                 byte[] bytes = buffer == null ? null : bufferLib.getInternalOrCopiedByteArray(buffer);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesCommonBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesCommonBuiltins.java
@@ -36,7 +36,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.J_REMOVEPREFIX;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_REMOVESUFFIX;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_STARTSWITH;
-import static com.oracle.graal.python.nodes.ErrorMessages.A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P;
+import static com.oracle.graal.python.nodes.ErrorMessages.BYTESLIKE_OBJ_REQUIRED;
 import static com.oracle.graal.python.nodes.ErrorMessages.DECODER_RETURNED_P_INSTEAD_OF_BYTES;
 import static com.oracle.graal.python.nodes.ErrorMessages.DESCRIPTOR_NEED_OBJ;
 import static com.oracle.graal.python.nodes.ErrorMessages.FIRST_ARG_MUST_BE_BYTES_OR_A_TUPLE_OF_BYTES_NOT_P;
@@ -500,7 +500,7 @@ static BytesNodes.ToBytesNode createToBytes() {
 
         @NeverDefault
         static BytesNodes.ToBytesNode createToBytesFromTuple() {
-            return BytesNodes.ToBytesNode.create(PythonBuiltinClassType.TypeError, A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P);
+            return BytesNodes.ToBytesNode.create(PythonBuiltinClassType.TypeError, BYTESLIKE_OBJ_REQUIRED);
         }
     }
 
@@ -1368,7 +1368,7 @@ static PBytesLike replace(Object self, Object substrBuffer, Object replacementBu
         @Fallback
         static boolean error(@SuppressWarnings("unused") Object self, Object substr, @SuppressWarnings("unused") Object replacement, @SuppressWarnings("unused") Object count,
                         @Cached PRaiseNode raiseNode) {
-            throw raiseNode.raise(TypeError, ErrorMessages.BYTESLIKE_OBJ_REQUIRED, substr);
+            throw raiseNode.raise(TypeError, BYTESLIKE_OBJ_REQUIRED, substr);
         }
 
         @TruffleBoundary(allowInlining = true)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/BuiltinMethodDescriptor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/BuiltinMethodDescriptor.java
@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.builtins.objects.function;
 
+import static com.oracle.graal.python.nodes.SpecialMethodNames.J___NEW__;
+
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -137,6 +139,9 @@ private static Builtin findBuiltinAnnotation(String name, NodeFactory<? extends
             if (builtin.name().equals(name)) {
                 return builtin;
             }
+            if (builtin.constructsClass() != PythonBuiltinClassType.nil && J___NEW__.equals(name)) {
+                return builtin;
+            }
         }
         throw new IllegalStateException(String.format(
                         "Cannot find corresponding builtin annotation on class %s for builtin '%s'",
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java
@@ -809,7 +809,6 @@ public abstract class ErrorMessages {
     public static final TruffleString CANNOT_INTERN_P = tsLiteral("can't intern %p");
     public static final TruffleString METHOD_REQUIRES_A_BYTES_OBJECT_GOT_P = tsLiteral("Method requires a 'bytes' object, got '%p'");
     public static final TruffleString FIRST_ARG_MUST_BE_BYTES_OR_A_TUPLE_OF_BYTES_NOT_P = tsLiteral("first arg must be bytes or a tuple of bytes, not %p");
-    public static final TruffleString A_BYTES_LIKE_OBJECT_IS_REQUIRED_NOT_P = tsLiteral("a bytes-like object is required, not '%p'");
     public static final TruffleString TYPE_S_TAKES_AT_LEAST_ONE_ARGUMENT = tsLiteral("type '%s' takes at least one argument");
     public static final TruffleString S_TAKES_AT_LEAST_D_ARGUMENTS_D_GIVEN = tsLiteral("%s() takes at least %d arguments (%d given)");
     public static final TruffleString S_TAKES_AT_MOST_D_ARGUMENTS_D_GIVEN = tsLiteral("%s() takes at most %d arguments (%d given)");
diff --git a/graalpython/lib-graalpython/patches/Cython/Cython-0.29.37.patch b/graalpython/lib-graalpython/patches/Cython/Cython-0.29.37.patch
@@ -177,6 +177,33 @@ index aaa8a8e..152e9dc 100644
      Py_DECREF(ev);
  #else
      {
+@@ -715,7 +713,7 @@ PyObject *__Pyx_Coroutine_SendEx(__pyx_CoroutineObject *self, PyObject *value, i
+ 
+     exc_state = &self->gi_exc_state;
+     if (exc_state->exc_type) {
+-        #if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON
++        #if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON || GRAALVM_PYTHON
+         // FIXME: what to do in PyPy?
+         #else
+         // Generators always return to their most recent caller, not
+@@ -777,7 +775,7 @@ static CYTHON_INLINE void __Pyx_Coroutine_ResetFrameBackpointer(__Pyx_ExcInfoStr
+     PyObject *exc_tb = exc_state->exc_traceback;
+ 
+     if (likely(exc_tb)) {
+-#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON
++#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON || GRAALVM_PYTHON
+     // FIXME: what to do in PyPy?
+ #else
+         PyTracebackObject *tb = (PyTracebackObject *) exc_tb;
+@@ -1250,7 +1248,7 @@ static void __Pyx_Coroutine_del(PyObject *self) {
+ #else
+         {PyObject *msg;
+         char *cmsg;
+-        #if CYTHON_COMPILING_IN_PYPY
++        #if CYTHON_COMPILING_IN_PYPY || GRAALVM_PYTHON
+         msg = NULL;
+         cmsg = (char*) "coroutine was never awaited";
+         #else
 diff --git a/Cython/Utility/CythonFunction.c b/Cython/Utility/CythonFunction.c
 index 93f577f..5dac1d7 100644
 --- a/Cython/Utility/CythonFunction.c
@@ -212,7 +239,7 @@ index cfff606..4a6a6ea 100644
 +  #undef CYTHON_USE_PYTYPE_LOOKUP
 +  #define CYTHON_USE_PYTYPE_LOOKUP 0
 +  #undef CYTHON_USE_ASYNC_SLOTS
-+  #define CYTHON_USE_ASYNC_SLOTS 0
++  #define CYTHON_USE_ASYNC_SLOTS 1
 +  #undef CYTHON_USE_PYLIST_INTERNALS
 +  #define CYTHON_USE_PYLIST_INTERNALS 0
 +  #undef CYTHON_USE_UNICODE_INTERNALS
diff --git a/graalpython/lib-graalpython/patches/greenlet/greenlet-3.0.0.patch b/graalpython/lib-graalpython/patches/greenlet/greenlet-3.0.0.patch
@@ -0,0 +1,22 @@
+diff --git a/src/greenlet/TThreadStateDestroy.cpp b/src/greenlet/TThreadStateDestroy.cpp
+index 645bf52..80e8864 100644
+--- a/src/greenlet/TThreadStateDestroy.cpp
++++ b/src/greenlet/TThreadStateDestroy.cpp
+@@ -125,6 +125,9 @@ struct ThreadState_DestroyNoGIL
+         // drop this lock.
+         LockGuard cleanup_lock(*mod_globs->thread_states_to_destroy_lock);
+ 
++#if GRAALVM_PYTHON
++        return; // 'PyInterpreterState_Head()' is not supported
++#else
+         if (state && state->has_main_greenlet()) {
+             // Because we don't have the GIL, this is a race condition.
+             if (!PyInterpreterState_Head()) {
+@@ -150,6 +153,7 @@ struct ThreadState_DestroyNoGIL
+                 }
+             }
+         }
++#endif
+     }
+ 
+     static int
diff --git a/graalpython/lib-graalpython/patches/greenlet/metadata.toml b/graalpython/lib-graalpython/patches/greenlet/metadata.toml
@@ -0,0 +1,3 @@
+[[rules]]
+version = '>= 3.0.0'
+patch = 'greenlet-3.0.0.patch'
diff --git a/graalpython/lib-graalpython/patches/ray/ray-2.9.1.patch b/graalpython/lib-graalpython/patches/ray/ray-2.9.1.patch
