Apply suggestions from code review

Co-authored-by: Dan Halbert <[email protected]>

Author: tannewt

py/objarray.c

@@ -120,6 +120,7 @@ static mp_obj_array_t *array_new(char typecode, size_t n) {
     o->free = 0;
     o->len = n;
     // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE
     o->items = m_malloc(typecode_size * o->len);
     return o;
 }
@@ -229,6 +230,7 @@ static mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args,
 #if MICROPY_PY_BUILTINS_MEMORYVIEW
 
 mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items) {
+    // CIRCUITPY-CHANGE
     // CIRCUITPY-CHANGE
     mp_obj_array_t *self = mp_obj_malloc(mp_obj_array_t, &mp_type_memoryview);
     mp_obj_memoryview_init(self, typecode, 0, nitems, items);
@@ -690,6 +692,7 @@ static mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                     mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("memoryview offset too large"));
                 }
                 // CIRCUITPY-CHANGE
+                // CIRCUITPY-CHANGE
                 res = mp_obj_malloc(mp_obj_array_t, &mp_type_memoryview);
                 *res = *o;
                 res->memview_offset += slice.start;

py/objclosure.c

@@ -51,6 +51,7 @@ static mp_obj_t closure_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     } else {
         // use heap to allocate temporary args array
         // CIRCUITPY-CHANGE
+        // CIRCUITPY-CHANGE
         mp_obj_t *args2 = m_malloc_items(n_total);
         memcpy(args2, self->closed, self->n_closed * sizeof(mp_obj_t));
         memcpy(args2 + self->n_closed, args, (n_args + 2 * n_kw) * sizeof(mp_obj_t));

py/objdeque.c

@@ -59,6 +59,7 @@ static mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     o->alloc = maxlen + 1;
     o->i_get = o->i_put = 0;
     // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE
     o->items = m_malloc_items(o->alloc);
 
     if (n_args > 2) {

py/objexcept.c

@@ -94,6 +94,7 @@ mp_obj_t mp_alloc_emergency_exception_buf(mp_obj_t size_in) {
     mp_int_t size = mp_obj_get_int(size_in);
     void *buf = NULL;
     if (size > 0) {
+        // CIRCUITPY-CHANGE
         // CIRCUITPY-CHANGE
         buf = m_malloc_with_collect(size);
     }
@@ -222,6 +223,7 @@ mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     // Try to allocate memory for the exception, with fallback to emergency exception object
     // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE
     mp_obj_exception_t *o_exc = m_malloc_maybe_with_collect(sizeof(mp_obj_exception_t));
     if (o_exc == NULL) {
         o_exc = &MP_STATE_VM(mp_emergency_exception_obj);
@@ -546,6 +548,7 @@ mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_er
     // CIRCUITPY-CHANGE: here and more below
     size_t o_str_alloc = decompress_length(fmt);
     if (gc_alloc_possible()) {
+        // CIRCUITPY-CHANGE
         // CIRCUITPY-CHANGE
         o_str = m_malloc_maybe_with_collect(sizeof(mp_obj_str_t));
         o_str_buf = m_new_maybe(byte, o_str_alloc);
@@ -664,6 +667,7 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qs
 
     // Try to allocate memory for the traceback, with fallback to emergency traceback object
     if (self->traceback == NULL || self->traceback == (mp_obj_traceback_t *)&mp_const_empty_traceback_obj) {
+        // CIRCUITPY-CHANGE
         // CIRCUITPY-CHANGE
         self->traceback = m_malloc_maybe_with_collect(sizeof(mp_obj_traceback_t));
         if (self->traceback == NULL) {

py/objtuple.c

@@ -87,6 +87,7 @@ static mp_obj_t mp_obj_tuple_make_new(const mp_obj_type_t *type_in, size_t n_arg
             size_t alloc = 4;
             size_t len = 0;
             // CIRCUITPY-CHANGE
+            // CIRCUITPY-CHANGE
             mp_obj_t *items = m_malloc_items(alloc);
 
             mp_obj_t iterable = mp_getiter(args[0], NULL);

py/objtype.c

@@ -96,6 +96,7 @@ static mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *pos_args
     pos_args++;
     n_args--;
 
+    // CIRCUITPY-CHANGE
     // CIRCUITPY-CHANGE
     mp_obj_t *args2 = m_malloc_items(n_args + 2 * n_kw);
     // copy in args
@@ -341,6 +342,7 @@ static mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_arg
             mp_obj_t args2[1] = {MP_OBJ_FROM_PTR(self)};
             new_ret = mp_call_function_n_kw(init_fn[0], 1, 0, args2);
         } else {
+            // CIRCUITPY-CHANGE
             // CIRCUITPY-CHANGE
             mp_obj_t *args2 = m_malloc_items(1 + n_args + 2 * n_kw);
             args2[0] = MP_OBJ_FROM_PTR(self);
@@ -373,6 +375,7 @@ static mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_arg
         if (n_args == 0 && n_kw == 0) {
             init_ret = mp_call_method_n_kw(0, 0, init_fn);
         } else {
+            // CIRCUITPY-CHANGE
             // CIRCUITPY-CHANGE
             mp_obj_t *args2 = m_malloc_items(2 + n_args + 2 * n_kw);
             args2[0] = init_fn[0];
@@ -1516,6 +1519,7 @@ mp_obj_t mp_obj_cast_to_native_base(mp_obj_t self_in, mp_const_obj_t native_type
 /******************************************************************************/
 // staticmethod and classmethod types (probably should go in a different file)
 
+// CIRCUITPY-CHANGE: better arg name
 // CIRCUITPY-CHANGE: better arg name
 static mp_obj_t static_class_method_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(type == &mp_type_staticmethod || type == &mp_type_classmethod);

py/parse.c

@@ -287,6 +287,7 @@ static void *parser_alloc(parser_t *parser, size_t num_bytes) {
             alloc = num_bytes;
         }
         // CIRCUITPY-CHANGE
+        // CIRCUITPY-CHANGE
         chunk = (mp_parse_chunk_t *)m_malloc_with_collect(sizeof(mp_parse_chunk_t) + alloc);
         chunk->alloc = alloc;
         chunk->union_.used = 0;
@@ -1056,6 +1057,7 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
     parser.result_stack_top = 0;
     parser.result_stack = NULL;
     while (parser.result_stack_alloc > 1) {
+        // CIRCUITPY-CHANGE
         // CIRCUITPY-CHANGE
         parser.result_stack = m_malloc_maybe_with_collect(sizeof(mp_parse_node_t) * parser.result_stack_alloc);
         if (parser.result_stack != NULL) {

py/scope.c

@@ -51,6 +51,7 @@ scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, mp_uint_t emit_options
     MP_STATIC_ASSERT(MP_QSTR__lt_setcomp_gt_ <= UINT8_MAX);
     MP_STATIC_ASSERT(MP_QSTR__lt_genexpr_gt_ <= UINT8_MAX);
 
+    // CIRCUITPY-CHANGE
     // CIRCUITPY-CHANGE
     scope_t *scope = m_new_struct_with_collect(scope_t, 1);
     scope->kind = kind;

shared-bindings/displayio/Group.c

@@ -318,6 +318,7 @@ static mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t valu
 static mp_obj_t displayio_group_obj_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     displayio_group_t *self = native_group(pos_args[0]);
     // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE
     mp_obj_t *args = m_malloc_items(n_args);
     for (size_t i = 1; i < n_args; ++i) {
         args[i] = pos_args[i];