From bd63c26dd5560e1037fa06e79f99627de5772da5 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Fri, 10 Apr 2020 16:09:29 -0400 Subject: [PATCH] py/scope: Add assert to check that low numbered qstrs do fit in uint8_t. --- py/scope.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/py/scope.c b/py/scope.c index 1e45139b08..073c2a38c2 100644 --- a/py/scope.c +++ b/py/scope.c @@ -30,7 +30,7 @@ #if MICROPY_ENABLE_COMPILER -// these low numbered qstrs should fit in 8 bits +// These low numbered qstrs should fit in 8 bits. See assertions below. STATIC const uint8_t scope_simple_name_table[] = { [SCOPE_MODULE] = MP_QSTR__lt_module_gt_, [SCOPE_LAMBDA] = MP_QSTR__lt_lambda_gt_, @@ -41,6 +41,14 @@ STATIC const uint8_t scope_simple_name_table[] = { }; scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options) { + // Make sure those qstrs indeed fit in an uint8_t. + MP_STATIC_ASSERT(MP_QSTR__lt_module_gt_ <= UINT8_MAX); + MP_STATIC_ASSERT(MP_QSTR__lt_lambda_gt_ <= UINT8_MAX); + MP_STATIC_ASSERT(MP_QSTR__lt_listcomp_gt_ <= UINT8_MAX); + MP_STATIC_ASSERT(MP_QSTR__lt_dictcomp_gt_ <= UINT8_MAX); + MP_STATIC_ASSERT(MP_QSTR__lt_setcomp_gt_ <= UINT8_MAX); + MP_STATIC_ASSERT(MP_QSTR__lt_genexpr_gt_ <= UINT8_MAX); + scope_t *scope = m_new0(scope_t, 1); scope->kind = kind; scope->pn = pn;