profile: Fix printing frame objects.

jepler · jepler · commit ec1036fa891f · 2025-06-22T08:11:23.000+02:00
The argument corresponding to a `%q` specifier must be of type
`qstr`, not a narrower type like `int16_t`. Not ensuring this
caused an assertion error on one Windows x64 build.

The argument corresponding to a `%d` specifier must be of type
`int`, not a potentially-wider type like `mp_uint_t`. Not ensuring
this prevented the function name from being printed on the
unix nanbox build.

Signed-off-by: Jeff Epler &lt;jepler@gmail.com&gt;
diff --git a/py/objcode.h b/py/objcode.h
@@ -72,7 +72,7 @@ static inline const void *mp_code_get_proto_fun(mp_obj_code_t *self) {
 
 #include "py/emitglue.h"
 
-#define MP_CODE_QSTR_MAP(context, idx) (context->constants.qstr_table[idx])
+#define MP_CODE_QSTR_MAP(context, idx) (qstr)(context->constants.qstr_table[idx])
 
 typedef struct _mp_obj_code_t {
     // TODO this was 4 words
diff --git a/py/profile.c b/py/profile.c
@@ -80,7 +80,7 @@ static void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
         "<frame at 0x%p, file '%q', line %d, code %q>",
         frame,
         MP_CODE_QSTR_MAP(code->context, 0),
-        frame->lineno,
+        (int)frame->lineno,
         MP_CODE_QSTR_MAP(code->context, prelude->qstr_block_name_idx)
         );
 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t`
`80`	`80`	`"<frame at 0x%p, file '%q', line %d, code %q>",`
`81`	`81`	`frame,`
`82`	`82`	`MP_CODE_QSTR_MAP(code->context, 0),`
`83`		`- frame->lineno,`
	`83`	`+ (int)frame->lineno,`
`84`	`84`	`MP_CODE_QSTR_MAP(code->context, prelude->qstr_block_name_idx)`
`85`	`85`	`);`
`86`	`86`	`}`