[GR-51961] Keep our C file structure closer to CPython, part 1

PullRequest: graalpython/3192

Author: msimacek

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

@@ -17,7 +17,7 @@
 /* --- Internal Unicode Operations ---------------------------------------- */
 
 #ifndef USE_UNICODE_WCHAR_CACHE
-#  define USE_UNICODE_WCHAR_CACHE 1
+#  define USE_UNICODE_WCHAR_CACHE 0 // GraalPy change
 #endif /* USE_UNICODE_WCHAR_CACHE */
 
 /* Since splitting on whitespace is an important use case, and

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

@@ -13,7 +13,9 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-// #include "pycore_pystate.h"       // _PyThreadState_GET()
+#if 0 // GraalPy change
+#include "pycore_pystate.h"       // _PyThreadState_GET()
+#endif // GraalPy change
 
 PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
     PyThreadState *tstate,
@@ -95,8 +97,7 @@ _PyObject_VectorcallTstate(PyThreadState *tstate, PyObject *callable,
         return _PyObject_MakeTpCall(tstate, callable, args, nargs, kwnames);
     }
     res = func(callable, args, nargsf, kwnames);
-    // return _Py_CheckFunctionResult(tstate, callable, res, NULL);
-    return res;
+    return _Py_CheckFunctionResult(tstate, callable, res, NULL);
 }
 
 
@@ -109,9 +110,8 @@ _PyObject_CallNoArgsTstate(PyThreadState *tstate, PyObject *func) {
 // Private static inline function variant of public PyObject_CallNoArgs()
 static inline PyObject *
 _PyObject_CallNoArgs(PyObject *func) {
-    // PyThreadState *tstate = _PyThreadState_GET();
-    // return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
-    return _PyObject_VectorcallTstate(NULL, func, NULL, 0, NULL);
+    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
 }
 
 

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2023, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -24,7 +24,8 @@ extern void _PyErr_FiniTypes(PyInterpreterState *);
 
 static inline PyObject* _PyErr_Occurred(PyThreadState *tstate)
 {
-    return PyErr_Occured();
+    // GraalPy change
+    return PyErr_Occurred();
 }
 
 static inline void _PyErr_ClearExcState(_PyErr_StackItem *exc_state)

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2022, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -67,7 +67,7 @@ struct _Py_tuple_state {
 #endif
 };
 
-#define _PyTuple_ITEMS(op) (PySequence_FAST_ITEMS(op))
+#define _PyTuple_ITEMS(op) (PySequence_Fast_ITEMS(op))
 
 extern PyObject *_PyTuple_FromArray(PyObject *const *, Py_ssize_t);
 extern PyObject *_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -176,13 +176,3 @@ int PyErr_WarnExplicitFormat(PyObject *category,
     return ret;
 }
 
-PyObject* _PyErr_FormatFromCause(PyObject *exception, const char *format, ...) {
-	// dummy implementation that ignores the cause
-    va_list args;
-    va_start(args, format);
-    PyObject* formatted_msg = PyUnicode_FromFormatV(format, args);
-    va_end(args);
-    Graal_PyTruffleErr_CreateAndSetException(exception, formatted_msg);
-    return NULL;
-}
-

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

@@ -64,3 +64,14 @@ void bytearray_releasebuffer(PyByteArrayObject *obj, Py_buffer *view) {
 Py_ssize_t PyByteArray_Size(PyObject *self) {
     return PyByteArray_GET_SIZE(self);
 }
+
+PyObject* PyByteArray_FromStringAndSize(const char* str, Py_ssize_t sz) {
+    if (sz < 0) {
+        PyErr_SetString(PyExc_SystemError, "Negative size passed to PyByteArray_FromStringAndSize");
+        return NULL;
+    }
+    if (str != NULL) {
+        return GraalPyTruffleByteArray_FromStringAndSize(str, sz);
+    }
+    return GraalPyTruffle_ByteArray_EmptyWithCapacity(sz);
+}