allocate the argparsing stacks managed

Author: timfel

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

@@ -44,7 +44,7 @@
 
 typedef struct _positional_argstack {
     PyObject* argv;
-    int argnum;
+    long argnum;
     struct _positional_argstack* prev;
 } positional_argstack;
 
@@ -93,9 +93,10 @@ int _PyArg_ParseTupleAndKeywords_SizeT(PyObject *argv, PyObject *kwds, const cha
     unsigned char rest_optional = 0;
     unsigned char rest_keywords_only = 0;
 
-    positional_argstack *v = (positional_argstack*)calloc(1, sizeof(positional_argstack));
+    positional_argstack *v = (positional_argstack*)truffle_managed_malloc(sizeof(positional_argstack));
     v->argv = argv;
     v->argnum = 0;
+    v->prev = NULL;
     positional_argstack *next;
 
     char c = format[format_idx];
@@ -320,7 +321,7 @@ int _PyArg_ParseTupleAndKeywords_SizeT(PyObject *argv, PyObject *kwds, const cha
                 PyErr_Format(PyExc_TypeError, "expected tuple, got %R", Py_TYPE(arg));
                 return 0;
             }
-            next = (positional_argstack*)calloc(1, sizeof(positional_argstack));
+            next = (positional_argstack*)truffle_managed_malloc(sizeof(positional_argstack));
             next->argv = arg;
             next->argnum = 0;
             next->prev = v;
@@ -330,9 +331,7 @@ int _PyArg_ParseTupleAndKeywords_SizeT(PyObject *argv, PyObject *kwds, const cha
             if (v->prev == NULL) {
                 PyErr_SetString(PyExc_SystemError, "')' without '(' in argument parsing");
             } else {
-                next = v;
                 v = v->prev;
-                free(next);
             }
             break;
         case '|':
@@ -354,7 +353,6 @@ int _PyArg_ParseTupleAndKeywords_SizeT(PyObject *argv, PyObject *kwds, const cha
     }
 
  end:
-    free(v);
     return 1;
 }
 
@@ -371,9 +369,10 @@ PyObject* _Py_BuildValue_SizeT(const char *format, ...) {
     char argchar[2] = {'\0'};
     unsigned int value_idx = 1;
     unsigned int format_idx = 0;
-    build_stack *v = (build_stack*)calloc(1, sizeof(build_stack));
+    build_stack *v = (build_stack*)truffle_managed_malloc(sizeof(build_stack));
     build_stack *next;
     v->list = PyList_New(0);
+    v->prev = NULL;
 
     char c = format[format_idx];
     while (c != '\0') {
@@ -484,7 +483,7 @@ PyObject* _Py_BuildValue_SizeT(const char *format, ...) {
             }
             break;
         case '(':
-            next = (build_stack*)calloc(1, sizeof(build_stack));
+            next = (build_stack*)truffle_managed_malloc(sizeof(build_stack));
             next->list = PyList_New(0);
             next->prev = v;
             v = next;
@@ -494,13 +493,11 @@ PyObject* _Py_BuildValue_SizeT(const char *format, ...) {
                 PyErr_SetString(PyExc_SystemError, "')' without '(' in Py_BuildValue");
             } else {
                 PyList_Append(v->prev->list, PyList_AsTuple(v->list));
-                next = v;
                 v = v->prev;
-                free(next);
             }
             break;
         case '[':
-            next = (build_stack*)calloc(1, sizeof(build_stack));
+            next = (build_stack*)truffle_managed_malloc(sizeof(build_stack));
             next->list = PyList_New(0);
             next->prev = v;
             v = next;
@@ -510,13 +507,11 @@ PyObject* _Py_BuildValue_SizeT(const char *format, ...) {
                 PyErr_SetString(PyExc_SystemError, "']' without '[' in Py_BuildValue");
             } else {
                 PyList_Append(v->prev->list, v->list);
-                next = v;
                 v = v->prev;
-                free(next);
             }
             break;
         case '{':
-            next = (build_stack*)calloc(1, sizeof(build_stack));
+            next = (build_stack*)truffle_managed_malloc(sizeof(build_stack));
             next->list = PyList_New(0);
             next->prev = v;
             v = next;
@@ -526,9 +521,7 @@ PyObject* _Py_BuildValue_SizeT(const char *format, ...) {
                 PyErr_SetString(PyExc_SystemError, "'}' without '{' in Py_BuildValue");
             } else {
                 PyList_Append(v->prev->list, to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "dict_from_list", to_java(v->list))));
-                next = v;
                 v = v->prev;
-                free(next);
             }
             break;
         case ':':