set_next_code_file(None) resets to the default search order.

Author: cwalther

main.c

@@ -259,12 +259,15 @@ bool cleanup_after_vm(supervisor_allocation* heap) {
         if (next_code_allocation) {
             free_memory(next_code_allocation);
         }
-        // TODO do I need to increase CIRCUITPY_SUPERVISOR_ALLOC_COUNT for this?
-        next_code_allocation = allocate_memory((next_code_len + 1 + 3) & ~3, false);
-        if (next_code_allocation) {
-            memcpy(next_code_allocation->ptr, next_code, next_code_len);
-            ((char*)next_code_allocation->ptr)[next_code_len] = '\0';
-            return true;
+        // empty filename and options 0 is equivalent to the default, no need to waste memory on that
+        if (next_code_len > 1 || next_code->options != 0) {
+            // TODO do I need to increase CIRCUITPY_SUPERVISOR_ALLOC_COUNT for this?
+            next_code_allocation = allocate_memory((next_code_len + 1 + 3) & ~3, false);
+            if (next_code_allocation) {
+                memcpy(next_code_allocation->ptr, next_code, next_code_len);
+                ((char*)next_code_allocation->ptr)[next_code_len] = '\0';
+                return true;
+            }
         }
     }
     return false;

shared-bindings/supervisor/__init__.c

@@ -120,9 +120,10 @@ STATIC mp_obj_t supervisor_set_next_code_file(size_t n_args, const mp_obj_t *pos
         mp_arg_val_t reload_on_success;
     } args;
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&args);
-    if (!MP_OBJ_IS_STR_OR_BYTES(args.filename.u_obj)) {
+    if (!MP_OBJ_IS_STR_OR_BYTES(args.filename.u_obj) && args.filename.u_obj != mp_const_none) {
         mp_raise_TypeError(translate("argument has wrong type"));
     }
+    if (args.filename.u_obj == mp_const_none) args.filename.u_obj = mp_const_empty_bytes;
     mp_obj_t items[] = {
         args.filename.u_obj,
         args.reload_on_success.u_bool ? MP_OBJ_NEW_SMALL_INT(SUPERVISOR_NEXT_CODE_OPT_RELOAD_ON_SUCCESS) : MP_OBJ_NEW_SMALL_INT(0)