implement review feedback and fix comment

python · iritkatriel · Mar 13, 2025 · Mar 6, 2025 · Mar 7, 2025 · Mar 7, 2025
commit 344888d645456635d732d6a38a6f59295d79f7bb
diff --git a/Include/internal/pycore_c_array.h b/Include/internal/pycore_c_array.h
@@ -1,5 +1,6 @@
 #ifndef Py_INTERNAL_C_ARRAY_H
 #define Py_INTERNAL_C_ARRAY_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,19 +19,20 @@ extern "C" {
  * item_size: size of each array entry
  *
  * If *array is NULL, allocate default_alloc entries.
- * Otherwise, grow the array by default_alloc entries.
+ * Otherwise, double the array size if idx is out of range.
  *
- * return 0 if successful and -1 (with exception set) otherwise.
+ * Return 0 if successful and -1 (with exception set) otherwise.
  */
 int _Py_EnsureArrayLargeEnough(
-        int idx,
-        void **array,
-        int *alloc,
-        int delta,
-        size_t item_size);
+    int idx,
+    void **array,
+    int *alloc,
+    int initial_size,
+    size_t item_size);
 
 
 #ifdef __cplusplus
 }
 #endif
+
 #endif /* !Py_INTERNAL_C_ARRAY_H */
diff --git a/Include/internal/pycore_compile.h b/Include/internal/pycore_compile.h
@@ -11,7 +11,6 @@ extern "C" {
 #include <stdbool.h>
 
 #include "pycore_ast.h"       // mod_ty
-#include "pycore_c_array.h"   // _Py_EnsureArrayLargeEnough()
 #include "pycore_symtable.h"  // _Py_SourceLocation
 #include "pycore_instruction_sequence.h"
 

@@ -115,19 +115,19 @@ static const int compare_masks[] = {
  * idx: the index we want to access
  * arr: pointer to the array
  * alloc: pointer to the capacity of the array
- * default_alloc: initial number of items
+ * initial_size: initial number of items
  * item_size: size of each item
  *
  */
 int
 _Py_EnsureArrayLargeEnough(int idx, void **array, int *alloc,
-                           int default_alloc, size_t item_size)
+                           int initial_size, size_t item_size)
 {
     void *arr = *array;
     if (arr == NULL) {
-        int new_alloc = default_alloc;
+        int new_alloc = initial_size;
         if (idx >= new_alloc) {
-            new_alloc = idx + default_alloc;
+            new_alloc = idx + initial_size;
         }
         arr = PyMem_Calloc(new_alloc, item_size);
         if (arr == NULL) {
@@ -140,7 +140,7 @@ _Py_EnsureArrayLargeEnough(int idx, void **array, int *alloc,
         size_t oldsize = *alloc * item_size;
         int new_alloc = *alloc << 1;
         if (idx >= new_alloc) {
-            new_alloc = idx + default_alloc;
+            new_alloc = idx + initial_size;
         }
         size_t newsize = new_alloc * item_size;