tidy up API

Author: iritkatriel

Include/internal/pycore_c_array.h

@@ -13,12 +13,16 @@ extern "C" {
 /* Utility for a number of growing arrays */
 
 typedef struct {
-    void **array;             /* pointer to the array */
-    int *allocated_entries;   /* pointer to the capacity of the array */
+    void *array;              /* pointer to the array */
+    int allocated_entries;    /* pointer to the capacity of the array */
     size_t item_size;         /* size of each element */
     int initial_num_entries;  /* initial allocation size */
 } _Py_c_array_t;
 
+
+int _Py_CArray_Init(_Py_c_array_t* array, int item_size, int initial_num_entries);
+void _Py_CArray_Fini(_Py_c_array_t* array);
+
 /* If idx is out of bounds:
  * If arr->array is NULL, allocate arr->initial_num_entries slots.
  * Otherwise, double its size.

Python/codegen.c

@@ -111,11 +111,28 @@ static const int compare_masks[] = {
 };
 
 
+int
+_Py_CArray_Init(_Py_c_array_t* array, int item_size, int initial_num_entries) {
+    memset(array, 0, sizeof(_Py_c_array_t));
+    array->item_size = item_size;
+    array->initial_num_entries = initial_num_entries;
+    return 0;
+}
+
+void
+_Py_CArray_Fini(_Py_c_array_t* array)
+{
+    if (array->array) {
+        PyMem_Free(array->array);
+        array->allocated_entries = 0;
+    }
+}
+
 int
 _Py_CArray_EnsureCapacity(_Py_c_array_t *c_array, int idx)
 {
-    void *arr = *c_array->array;
-    int alloc = *c_array->allocated_entries;
+    void *arr = c_array->array;
+    int alloc = c_array->allocated_entries;
     if (arr == NULL) {
         int new_alloc = c_array->initial_num_entries;
         if (idx >= new_alloc) {
@@ -152,8 +169,8 @@ _Py_CArray_EnsureCapacity(_Py_c_array_t *c_array, int idx)
         memset((char *)arr + oldsize, 0, newsize - oldsize);
     }
 
-    *c_array->array = arr;
-    *c_array->allocated_entries = alloc;
+    c_array->array = arr;
+    c_array->allocated_entries = alloc;
     return SUCCESS;
 }
 

Python/flowgraph.c

@@ -143,13 +143,15 @@ basicblock_next_instr(basicblock *b)
 {
     assert(b != NULL);
     _Py_c_array_t array = {
-        .array = (void**)&b->b_instr,
-        .allocated_entries = &b->b_ialloc,
+        .array = (void*)b->b_instr,
+        .allocated_entries = b->b_ialloc,
         .item_size = sizeof(cfg_instr),
         .initial_num_entries = DEFAULT_BLOCK_SIZE,
     };
 
     RETURN_IF_ERROR(_Py_CArray_EnsureCapacity(&array, b->b_iused + 1));
+    b->b_instr = array.array;
+    b->b_ialloc = array.allocated_entries;
     return b->b_iused++;
 }
 

Python/instruction_sequence.c

@@ -39,13 +39,15 @@ instr_sequence_next_inst(instr_sequence *seq) {
 
 
     _Py_c_array_t array = {
-        .array = (void**)&seq->s_instrs,
-        .allocated_entries = &seq->s_allocated,
+        .array = (void*)seq->s_instrs,
+        .allocated_entries = seq->s_allocated,
         .item_size = sizeof(instruction),
         .initial_num_entries = INITIAL_INSTR_SEQUENCE_SIZE,
     };
 
     RETURN_IF_ERROR(_Py_CArray_EnsureCapacity(&array, seq->s_used + 1));
+    seq->s_instrs = array.array;
+    seq->s_allocated = array.allocated_entries;
 
     assert(seq->s_allocated >= 0);
     assert(seq->s_used < seq->s_allocated);
@@ -64,13 +66,15 @@ _PyInstructionSequence_UseLabel(instr_sequence *seq, int lbl)
 {
     int old_size = seq->s_labelmap_size;
     _Py_c_array_t array = {
-        .array = (void**)&seq->s_labelmap,
-        .allocated_entries = &seq->s_labelmap_size,
+        .array = (void*)seq->s_labelmap,
+        .allocated_entries = seq->s_labelmap_size,
         .item_size = sizeof(int),
         .initial_num_entries = INITIAL_INSTR_SEQUENCE_LABELS_MAP_SIZE,
     };
 
     RETURN_IF_ERROR(_Py_CArray_EnsureCapacity(&array, lbl));
+    seq->s_labelmap = array.array;
+    seq->s_labelmap_size = array.allocated_entries;
 
     for(int i = old_size; i < seq->s_labelmap_size; i++) {
         seq->s_labelmap[i] = -111;  /* something weird, for debugging */