* [PATCH] dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's
@ 2016-02-08 15:13 Oleg Nesterov
2016-09-26 17:54 ` Lance Richardson
2016-11-02 14:19 ` [PATCH] " Luc Van Oostenryck
0 siblings, 2 replies; 3+ messages in thread
From: Oleg Nesterov @ 2016-02-08 15:13 UTC (permalink / raw)
To: Christopher Li, Josh Triplett; +Cc: linux-sparse
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(-)
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++;
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's
2016-02-08 15:13 [PATCH] dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's Oleg Nesterov
@ 2016-09-26 17:54 ` Lance Richardson
2016-11-02 14:19 ` [PATCH] " Luc Van Oostenryck
1 sibling, 0 replies; 3+ messages in thread
From: Lance Richardson @ 2016-09-26 17:54 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: Christopher Li, Josh Triplett, linux-sparse
+++ 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's
2016-02-08 15:13 [PATCH] dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's Oleg Nesterov
2016-09-26 17:54 ` Lance Richardson
@ 2016-11-02 14:19 ` Luc Van Oostenryck
1 sibling, 0 replies; 3+ messages in thread
From: Luc Van Oostenryck @ 2016-11-02 14:19 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: Christopher Li, Josh Triplett, linux-sparse
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-02 14:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-08 15:13 [PATCH] dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's Oleg Nesterov
2016-09-26 17:54 ` Lance Richardson
2016-11-02 14:19 ` [PATCH] " Luc Van Oostenryck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).