| Message ID | 20160208151328.GA24783@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
+++ Oleg Nesterov [08/02/16 16:13 +0100]: >do_initializer() is very limited/buggy but it was able to parse the kernel >code until ftrace started to use ".a.b = x" rather than ".a = { .b = x }" >in initializers. > >Test-case: > > struct O { > struct I { > int mem; > } inn; > int end; > } var = { > .inn.mem = 0, > 0, > }; > >before the patch: > > 1:8 s def O > 2:16 s def I > 6:3 g def var struct O > 6:3 g -w- var struct O > 7:10 s -w- O.inn struct I > 7:10 s -w- I.* struct I > I.c:7:14: warning: bad expr->type: 25 > 8:9 s -w- O.end int > >after: > > 1:8 s def O > 2:16 s def I > 6:3 g def var struct O > 6:3 g -w- var struct O > 7:10 s -w- O.inn struct I > 7:14 s -w- I.mem int > 8:9 s -w- O.end int > >Signed-off-by: Oleg Nesterov <oleg@redhat.com> >--- LGTM, builds and test case works as expected. Acked-by: Lance Richardson <lrichard@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Feb 08, 2016 at 04:13:28PM +0100, Oleg Nesterov wrote: > do_initializer() is very limited/buggy but it was able to parse the kernel > code until ftrace started to use ".a.b = x" rather than ".a = { .b = x }" > in initializers. LGTM and anyway, you know this dissect better than anyone else, no? Reviewed-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/dissect.c b/dissect.c index 19f3276..2d13d2a 100644 --- a/dissect.c +++ b/dissect.c @@ -547,18 +547,23 @@ static struct symbol *do_initializer(struct symbol *type, struct expression *exp if (m_expr->type == EXPR_INDEX) m_expr = m_expr->idx_expression; } else { - struct position *pos = &m_expr->pos; - struct ident *m_name = NULL; + int *m_atop = &m_addr; - if (m_expr->type == EXPR_IDENTIFIER) { - m_name = m_expr->expr_ident; + m_type = type; + while (m_expr->type == EXPR_IDENTIFIER) { + m_type = report_member(U_W_VAL, &m_expr->pos, m_type, + lookup_member(m_type, m_expr->expr_ident, m_atop)); m_expr = m_expr->ident_expression; + m_atop = NULL; + } + + if (m_atop) { + m_type = report_member(U_W_VAL, &m_expr->pos, m_type, + lookup_member(m_type, NULL, m_atop)); } - m_type = report_member(U_W_VAL, pos, type, - lookup_member(type, m_name, &m_addr)); if (m_expr->type != EXPR_INITIALIZER) - report_implicit(U_W_VAL, pos, m_type); + report_implicit(U_W_VAL, &m_expr->pos, m_type); } do_initializer(m_type, m_expr); m_addr++;
do_initializer() is very limited/buggy but it was able to parse the kernel code until ftrace started to use ".a.b = x" rather than ".a = { .b = x }" in initializers. Test-case: struct O { struct I { int mem; } inn; int end; } var = { .inn.mem = 0, 0, }; before the patch: 1:8 s def O 2:16 s def I 6:3 g def var struct O 6:3 g -w- var struct O 7:10 s -w- O.inn struct I 7:10 s -w- I.* struct I I.c:7:14: warning: bad expr->type: 25 8:9 s -w- O.end int after: 1:8 s def O 2:16 s def I 6:3 g def var struct O 6:3 g -w- var struct O 7:10 s -w- O.inn struct I 7:14 s -w- I.mem int 8:9 s -w- O.end int Signed-off-by: Oleg Nesterov <oleg@redhat.com> --- dissect.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)