[GR-44294][GR-44354] Improve compatiblity with pyspark

PullRequest: graalpython/2875

Author: msimacek

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -58,9 +58,9 @@ PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,
     ((*(slicelen) = 0), -1) :                                               \
     ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \
      0))
-PyAPI_FUNC(PyObject*) PySlice_Start(PyObject *slice);
-PyAPI_FUNC(PyObject*) PySlice_Stop(PyObject *slice);
-PyAPI_FUNC(PyObject*) PySlice_Step(PyObject *slice);
+PyAPI_FUNC(PyObject*) PySlice_Start(PySliceObject *slice);
+PyAPI_FUNC(PyObject*) PySlice_Stop(PySliceObject *slice);
+PyAPI_FUNC(PyObject*) PySlice_Step(PySliceObject *slice);
 PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice,
                                Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
 PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,

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

@@ -923,7 +923,6 @@ static void PyTruffle_Log(int level, const char* format, ... ) {
 		va_list args;
 		va_start(args, format);
 		vsprintf(buffer,format, args);
-		printf("logg\n");
 #ifndef EXCLUDE_POLYGLOT_API
 		GraalPyTruffle_LogString(level, polyglot_from_string(buffer, SRC_CS));
 #else

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

@@ -109,7 +109,11 @@ int PyTruffle_AllocMemory(size_t size) {
 }
 
 void PyTruffle_FreeMemory(size_t size) {
-	PyTruffle_AllocatedMemory -= size;
+    if (PyTruffle_AllocatedMemory < size) {
+        PyTruffle_Log(PY_TRUFFLE_LOG_INFO, "PyTruffle_FreeMemory: assertion failure: underflow of memory allocation tracking\n");
+        PyTruffle_AllocatedMemory = size;
+    }
+    PyTruffle_AllocatedMemory -= size;
 }
 
 /* This is our version of 'PyObject_Free' which is also able to free Sulong handles. */
@@ -189,22 +193,25 @@ void* PyMem_RawCalloc(size_t nelem, size_t elsize) {
 
 void* PyMem_RawRealloc(void *ptr, size_t new_size) {
 	mem_head_t* old;
+	size_t old_size;
 
 	if (ptr != NULL) {
 		old = AS_MEM_HEAD(ptr);
-
-		// account for the difference in size
-		if (old->size >= new_size) {
-			PyTruffle_FreeMemory(old->size - new_size);
-		} else {
-			if (PyTruffle_AllocMemory(new_size - old->size)) {
-				return NULL;
-			}
-		}
+		old_size = old->size;
 	} else {
 		old = NULL;
+		old_size = 0;
 	}
 
+    // account for the difference in size
+    if (old_size >= new_size) {
+        PyTruffle_FreeMemory(old_size - new_size);
+    } else {
+        if (PyTruffle_AllocMemory(new_size - old_size)) {
+            return NULL;
+        }
+    }
+
     mem_head_t* ptr_with_head = (mem_head_t*) realloc(old, new_size + sizeof(mem_head_t));
     ptr_with_head->size = new_size;
     return FROM_MEM_HEAD(ptr_with_head);

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -117,14 +117,14 @@ Py_ssize_t PySlice_AdjustIndices(Py_ssize_t length, Py_ssize_t *start, Py_ssize_
     return 0;
 }
 
-PyObject* PySlice_Start(PyObject *slice) {
+PyObject* PySlice_Start(PySliceObject *slice) {
     return PySliceObject_start(slice);
 }
 
-PyObject* PySlice_Stop(PyObject *slice) {
+PyObject* PySlice_Stop(PySliceObject *slice) {
     return PySliceObject_stop(slice);
 }
 
-PyObject* PySlice_Step(PyObject *slice) {
+PyObject* PySlice_Step(PySliceObject *slice) {
     return PySliceObject_step(slice);
 }

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

@@ -3670,18 +3670,18 @@ PyAPI_FUNC(PyObject*) PySlice_New(PyObject* a, PyObject* b, PyObject* c) {
     PyObject* result = (PyObject*) GraalPySlice_New(a, b, c);
     return result;
 }
-PyObject* (*__target__PySlice_Start)(PyObject*) = NULL;
-PyAPI_FUNC(PyObject*) PySlice_Start(PyObject* a) {
+PyObject* (*__target__PySlice_Start)(PySliceObject*) = NULL;
+PyAPI_FUNC(PyObject*) PySlice_Start(PySliceObject* a) {
     PyObject* result = (PyObject*) __target__PySlice_Start(a);
     return result;
 }
-PyObject* (*__target__PySlice_Step)(PyObject*) = NULL;
-PyAPI_FUNC(PyObject*) PySlice_Step(PyObject* a) {
+PyObject* (*__target__PySlice_Step)(PySliceObject*) = NULL;
+PyAPI_FUNC(PyObject*) PySlice_Step(PySliceObject* a) {
     PyObject* result = (PyObject*) __target__PySlice_Step(a);
     return result;
 }
-PyObject* (*__target__PySlice_Stop)(PyObject*) = NULL;
-PyAPI_FUNC(PyObject*) PySlice_Stop(PyObject* a) {
+PyObject* (*__target__PySlice_Stop)(PySliceObject*) = NULL;
+PyAPI_FUNC(PyObject*) PySlice_Stop(PySliceObject* a) {
     PyObject* result = (PyObject*) __target__PySlice_Stop(a);
     return result;
 }

graalpython/com.oracle.graal.python.test/src/tests/test_object.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2023, 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
@@ -168,5 +168,13 @@ def bar(self):
     AAA().foo()
     CCC().bar()
 
+
 def test_reduce_ex_with_none():
-    assert_raises(TypeError, object(), None)
+    assert_raises(TypeError, object(), None)
+
+
+def test_descr_call_with_none():
+    descr = object.__dict__['__class__']
+    assert None.__class__ is type(None)
+    assert descr.__get__(None, type(None)) is descr
+    assert_raises(TypeError, descr.__get__, None, None)