py: Fix CI-only thread globals access error.

koxudaxi · koxudaxi · commit c54490bd14bf · 2025-07-19T08:33:16.000Z
Always include __template__ in builtins table to maintain
consistent memory layout between MICROPY_PY_TSTRINGS
 enabled/disabled builds.

Signed-off-by: Koudai Aono &lt;koxudaxi@gmail.com&gt;
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
@@ -726,9 +726,6 @@ static const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_round), MP_ROM_PTR(&mp_builtin_round_obj) },
     { MP_ROM_QSTR(MP_QSTR_sorted), MP_ROM_PTR(&mp_builtin_sorted_obj) },
     { MP_ROM_QSTR(MP_QSTR_sum), MP_ROM_PTR(&mp_builtin_sum_obj) },
-    #if MICROPY_PY_TSTRINGS
-    { MP_ROM_QSTR(MP_QSTR___template__), MP_ROM_PTR(&mp_builtin___template___obj) },
-    #endif
 
     // built-in exceptions
     { MP_ROM_QSTR(MP_QSTR_BaseException), MP_ROM_PTR(&mp_type_BaseException) },
@@ -766,6 +763,13 @@ static const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_ZeroDivisionError), MP_ROM_PTR(&mp_type_ZeroDivisionError) },
 
+    // Always include __template__ entry to maintain consistent table structure
+    #if MICROPY_PY_TSTRINGS
+    { MP_ROM_QSTR(MP_QSTR___template__), MP_ROM_PTR(&mp_builtin___template___obj) },
+    #else
+    { MP_ROM_QSTR(MP_QSTR___template__), MP_ROM_PTR(mp_const_none) },
+    #endif
+
     // Extra builtins as defined by a port
     MICROPY_PORT_BUILTINS
     MICROPY_PORT_EXTRA_BUILTINS
