Make b_needsfree into boolean

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataBuiltins.java

@@ -115,7 +115,7 @@ protected abstract static class BNeedsFreeNode extends PythonUnaryBuiltinNode {
 
         @Specialization
         Object getBNeedsFree(CDataObject self) {
-            return self.b_needsfree != 0;
+            return self.b_needsfree;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataObject.java

@@ -64,29 +64,14 @@
 @ExportLibrary(PythonBufferAccessLibrary.class)
 public class CDataObject extends PythonBuiltinObject {
 
-    /*
-     * Hm. Are there CDataObject's which do not need the b_objects member? In this case we probably
-     * should introduce b_flags to mark it as present... If b_objects is not present/unused b_length
-     * is unneeded as well.
-     */
-
     Pointer b_ptr; /* pointer to memory block */
-    int b_needsfree; /* need _we_ free the memory? */
+    boolean b_needsfree; /* need _we_ free the memory? */
     CDataObject b_base; /* pointer to base object or NULL */
     int b_size; /* size of memory block in bytes */
     int b_length; /* number of references we need */
     int b_index; /* index of this object into base's b_object list */
     Object b_objects; /* dictionary of references we need to keep, or Py_None */
 
-    /*
-     * A default buffer in CDataObject, which can be used for small C types. If this buffer is too
-     * small, PyMem_Malloc will be called to create a larger one, and this one is not used.
-     *
-     * Making CDataObject a variable size object would be a better solution, but more difficult in
-     * the presence of PyCFuncPtrObject. Maybe later.
-     */
-    // Object b_value;
-
     public CDataObject(Object cls, Shape instanceShape) {
         super(cls, instanceShape);
         this.b_ptr = Pointer.NULL;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataTypeBuiltins.java

@@ -614,12 +614,9 @@ private static String toHex(int value) {
     }
 
     static void PyCData_MallocBuffer(CDataObject obj, StgDictObject dict) {
-        if (dict.size == 0) {
-            obj.b_ptr = Pointer.NULL;
-        } else {
-            obj.b_ptr = Pointer.allocate(dict.ffi_type_pointer, dict.size);
-        }
+        obj.b_ptr = dict.size > 0 ? Pointer.allocate(dict.ffi_type_pointer, dict.size) : Pointer.NULL;
         obj.b_size = dict.size;
+        obj.b_needsfree = true;
     }
 
     static CDataObject PyCData_FromBaseObj(Object type, Object base, int index, Pointer adr,
@@ -635,7 +632,7 @@ static CDataObject PyCData_FromBaseObj(Object type, Object base, int index, Poin
         cmem.b_size = dict.size;
         if (base != null) { /* use base's buffer */
             cmem.b_ptr = adr;
-            cmem.b_needsfree = 0;
+            cmem.b_needsfree = false;
             cmem.b_base = (CDataObject) base;
         } else { /* copy contents of adr */
             PyCData_MallocBuffer(cmem, dict);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java

@@ -622,29 +622,9 @@ Object resize(CDataObject obj, int size,
             if (size < dict.size) {
                 throw raise(ValueError, MINIMUM_SIZE_IS_D, dict.size);
             }
-            if (obj.b_needsfree == 0) {
+            if (obj.b_needsfree) {
                 throw raise(ValueError, MEMORY_CANNOT_BE_RESIZED_BECAUSE_THIS_OBJECT_DOESN_T_OWN_IT);
             }
-            /*- TODO
-            if (size <= sizeof(obj.b_value)) {
-                // internal default buffer is large enough
-                obj.b_size = size;
-                return PNone.NONE;
-            }
-            Object ptr;
-            if (!_CDataObject_HasExternalBuffer(obj)) {
-                /*
-                 * We are currently using the objects default buffer, but it isn't large enough any
-                 * more.
-                 * /
-                ptr = PyMem_Malloc(size);
-                memset(ptr, 0, size);
-                memmove(ptr, obj.b_ptr, obj.b_size);
-            } else {
-                ptr = PyMem_Realloc(obj.b_ptr, size);
-            }
-            obj.b_ptr.ptr = ptr;
-            */
             obj.b_size = size;
             return PNone.NONE;
         }