diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2022-08-22 17:08:05 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-08-26 16:43:55 +1000 |
| commit | 8a0ee5a5c04e83f04d1c62029ac5ba7c74856507 (patch) | |
| tree | eaa10ed5c00b4c21eea7def9fd0fbf5001a97dd4 /py/persistentcode.c | |
| parent | 09879f99ca3a6c0e48353eb2aaa1c71ed237f126 (diff) | |
py/objstr: Split mp_obj_str_from_vstr into bytes/str versions.
Previously the desired output type was specified. Now make the type part
of the function name. Because this function is used in a few places this
saves code size due to smaller call-site.
This makes `mp_obj_new_str_type_from_vstr` a private function of objstr.c
(which is almost the only place where the output type isn't a compile-time
constant).
This saves ~140 bytes on PYBV11.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Diffstat (limited to 'py/persistentcode.c')
| -rw-r--r-- | py/persistentcode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/py/persistentcode.c b/py/persistentcode.c index a8e742955..995dedb45 100644 --- a/py/persistentcode.c +++ b/py/persistentcode.c @@ -202,7 +202,11 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) { read_bytes(reader, (byte *)vstr.buf, len); if (obj_type == MP_PERSISTENT_OBJ_STR || obj_type == MP_PERSISTENT_OBJ_BYTES) { read_byte(reader); // skip null terminator - return mp_obj_new_str_from_vstr(obj_type == MP_PERSISTENT_OBJ_STR ? &mp_type_str : &mp_type_bytes, &vstr); + if (obj_type == MP_PERSISTENT_OBJ_STR) { + return mp_obj_new_str_from_vstr(&vstr); + } else { + return mp_obj_new_bytes_from_vstr(&vstr); + } } else if (obj_type == MP_PERSISTENT_OBJ_INT) { return mp_parse_num_integer(vstr.buf, vstr.len, 10, NULL); } else { |