py: mp_obj_get_type_qstr as macro saves 24 bytes

jepler · jepler · commit 65e26f4a0681 · 2020-08-04T14:45:45.000-05:00
diff --git a/py/obj.c b/py/obj.c
@@ -57,10 +57,6 @@ mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) {
     }
 }
 
-qstr mp_obj_get_type_qstr(mp_const_obj_t o_in) {
-    return mp_obj_get_type(o_in)->name;
-}
-
 const char *mp_obj_get_type_str(mp_const_obj_t o_in) {
     return qstr_str(mp_obj_get_type_qstr(o_in));
 }
diff --git a/py/obj.h b/py/obj.h
@@ -680,7 +680,7 @@ mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items);
 
 mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in);
 const char *mp_obj_get_type_str(mp_const_obj_t o_in);
-qstr mp_obj_get_type_qstr(mp_const_obj_t o_in);
+#define mp_obj_get_type_qstr(o_in) (mp_obj_get_type((o_in))->name)
 bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo); // arguments should be type objects
 mp_obj_t mp_instance_cast_to_native_base(mp_obj_t self_in, mp_const_obj_t native_type);
 

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,6 @@ mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-qstr mp_obj_get_type_qstr(mp_const_obj_t o_in) {`
`61`		`- return mp_obj_get_type(o_in)->name;`
`62`		`-}`
`63`		`-`
`64`	`60`	`const char *mp_obj_get_type_str(mp_const_obj_t o_in) {`
`65`	`61`	`return qstr_str(mp_obj_get_type_qstr(o_in));`
`66`	`62`	`}`