fix for allocations in sulong mode

Author: lukasstadler

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

@@ -715,6 +715,10 @@ PyAPI_FUNC(void) truffle_memcpy_bytes(void *dest, size_t dest_offset, void *src,
     memcpy(dest + dest_offset, src + src_offset, len);
 }
 
+PyAPI_FUNC(void*) truffle_calloc(size_t size) {
+	return calloc(1, size);
+}
+
 PyAPI_FUNC(void) register_native_slots(PyTypeObject* managed_class, PyGetSetDef* getsets, PyMemberDef* members) {
     if (getsets || members) {
         GraalPyTruffle_Set_Native_Slots(managed_class, getsets, members);

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

@@ -172,7 +172,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_FREE("free", ArgDescriptor.Void, Pointer),
     FUN_MEMMOVE("memmove", Pointer, Pointer, Pointer, SIZE_T),
     FUN_MEMSET("memset", Pointer, Pointer, Int, SIZE_T),
-    FUN_CALLOC("calloc", Pointer, SIZE_T, SIZE_T),
+    FUN_CALLOC("truffle_calloc", Pointer, SIZE_T),
     FUN_STRING_AT("string_at"),
     FUN_CAST("cast"),
     FUN_WSTRING_AT("wstring_at");

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

@@ -43,6 +43,7 @@
 
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
+import com.oracle.graal.python.builtins.objects.cext.common.NativePointer;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -81,7 +82,7 @@ protected final void setReplacement(Object pointer, InteropLibrary lib) {
         } else {
             replacement = pointer;
             if (lib.isPointer(pointer)) {
-                assert pointer.getClass().getSimpleName().contains("NFIPointer") || pointer.getClass().getSimpleName().contains("LLVMPointer");
+                assert pointer.getClass() == NativePointer.class || pointer.getClass().getSimpleName().contains("NFIPointer") || pointer.getClass().getSimpleName().contains("LLVMPointer");
                 try {
                     CApiTransitions.firstToNative(this, lib.asPointer(pointer));
                 } catch (UnsupportedMessageException e) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructAccess.java

@@ -53,6 +53,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PointerContainer;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeNewRefNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeNode;
+import com.oracle.graal.python.builtins.objects.cext.common.NativePointer;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccessFactory.FreeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccessFactory.ReadCharPtrNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccessFactory.ReadObjectNodeGen;
@@ -111,18 +112,18 @@ protected boolean nativeAccess() {
         }
 
         @Specialization(guards = {"!allocatePyMem", "nativeAccess()"})
-        static long allocLong(long size, @SuppressWarnings("unused") boolean allocatePyMem) {
+        static Object allocLong(long size, @SuppressWarnings("unused") boolean allocatePyMem) {
             assert size >= 0;
             long memory = UNSAFE.allocateMemory(size);
             UNSAFE.setMemory(memory, size, (byte) 0);
-            return memory;
+            return new NativePointer(memory);
         }
 
         @Specialization(guards = {"!allocatePyMem", "!nativeAccess()"})
         static Object allocLong(long size, @SuppressWarnings("unused") boolean allocatePyMem,
                         @Cached PCallCapiFunction call) {
             assert size >= 0;
-            return call.call(NativeCAPISymbol.FUN_CALLOC, size, 1);
+            return call.call(NativeCAPISymbol.FUN_CALLOC, size);
         }
 
         @Specialization(guards = "allocatePyMem")