py/objnamedtuple: Optimise slot RAM usage for namedtuple.

Rather than reserving a full 12-slot mp_obj_type_t, reserve enough room for
seven and cast as necessary.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 5666521617..52536be8b4 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -104,7 +104,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
         #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
         mp_raise_msg_varg(&mp_type_TypeError,
             MP_ERROR_TEXT("%q() takes %d positional arguments but %d were given"),
-            type->base.name, num_fields, n_args + n_kw);
+            ((mp_obj_type_t *)&type->base)->name, num_fields, n_args + n_kw);
         #endif
     }
 
@@ -153,17 +153,18 @@ mp_obj_namedtuple_type_t *mp_obj_new_namedtuple_base(size_t n_fields, mp_obj_t *
 
 STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t *fields) {
     mp_obj_namedtuple_type_t *o = mp_obj_new_namedtuple_base(n_fields, fields);
-    o->base.base.type = &mp_type_type;
-    o->base.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE; // can match tuple
-    o->base.name = name;
-    o->base.make_new = namedtuple_make_new;
-    MP_OBJ_TYPE_SET_SLOT(&o->base, print, namedtuple_print, 0);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, unary_op, mp_obj_tuple_unary_op, 1);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, binary_op, mp_obj_tuple_binary_op, 2);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, attr, namedtuple_attr, 3);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, subscr, mp_obj_tuple_subscr, 4);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, getiter, mp_obj_tuple_getiter, 5);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, parent, &mp_type_tuple, 6);
+    mp_obj_type_t *type = (mp_obj_type_t *)&o->base;
+    type->base.type = &mp_type_type;
+    type->flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE; // can match tuple
+    type->name = name;
+    type->make_new = namedtuple_make_new;
+    MP_OBJ_TYPE_SET_SLOT(type, print, namedtuple_print, 0);
+    MP_OBJ_TYPE_SET_SLOT(type, unary_op, mp_obj_tuple_unary_op, 1);
+    MP_OBJ_TYPE_SET_SLOT(type, binary_op, mp_obj_tuple_binary_op, 2);
+    MP_OBJ_TYPE_SET_SLOT(type, attr, namedtuple_attr, 3);
+    MP_OBJ_TYPE_SET_SLOT(type, subscr, mp_obj_tuple_subscr, 4);
+    MP_OBJ_TYPE_SET_SLOT(type, getiter, mp_obj_tuple_getiter, 5);
+    MP_OBJ_TYPE_SET_SLOT(type, parent, &mp_type_tuple, 6);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/py/objnamedtuple.h b/py/objnamedtuple.h
index 9f23351d5a..db4a3d87d8 100644
--- a/py/objnamedtuple.h
+++ b/py/objnamedtuple.h
@@ -29,10 +29,9 @@
 #include "py/objtuple.h"
 
 typedef struct _mp_obj_namedtuple_type_t {
-    // Must use the full-size version to avoid this being a variable sized member.
-    // This means that named tuples use slightly more RAM than necessary, but
-    // no worse than if we didn't have slots/split representation.
-    mp_obj_full_type_t base;
+    // This is a mp_obj_type_t with seven slots.
+    mp_obj_empty_type_t base;
+    void *slots[7];
     size_t n_fields;
     qstr fields[];
 } mp_obj_namedtuple_type_t;