From: Oleg Nesterov <oleg@redhat.com>
To: Christopher Li <sparse@chrisli.org>, Josh Triplett <josh@kernel.org>
Cc: linux-sparse@vger.kernel.org
Subject: [PATCH] dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's
Date: Mon, 8 Feb 2016 16:13:28 +0100 [thread overview]
Message-ID: <20160208151328.GA24783@redhat.com> (raw)
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
next reply other threads:[~2016-02-08 15:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 15:13 Oleg Nesterov [this message]
2016-09-26 17:54 ` dissect: teach do_initializer() to handle the nested EXPR_IDENTIFIER's Lance Richardson
2016-11-02 14:19 ` [PATCH] " Luc Van Oostenryck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160208151328.GA24783@redhat.com \
--to=oleg@redhat.com \
--cc=josh@kernel.org \
--cc=linux-sparse@vger.kernel.org \
--cc=sparse@chrisli.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).