diff options
author | Oleg Nesterov <oleg@redhat.com> | 2020-02-04 17:51:38 +0100 |
---|---|---|
committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2020-02-06 03:36:29 +0100 |
commit | c7b778b311d373ec5a2ff0f6af2855a4c6c4b01d (patch) | |
tree | 145b0c2dbb2fde1c3cf0a4a6ae834c759bf20633 | |
parent | 1dc00f876305b6a4d3dda38889a9165ff4bf1b0b (diff) | |
download | sparse-c7b778b311d373ec5a2ff0f6af2855a4c6c4b01d.tar.gz |
dissect: don't report anonymous members in initializers
Change report_member() to not call ->r_member(mem) if !mem->ident.
This can only happen in initializer, the output gives no useful info
but looks like a bug. Test-case:
struct {
union {
int x;
};
} var = {
{}
};
before this patch:
1:8 s def :var
5:3 g def var struct :var
5:3 g -w- var struct :var
6:9 s -w- :var.? union <noident>
after:
1:8 s def :var
5:3 g def var struct :var
5:3 g -w- var struct :var
We also need to change no_member() to ensure we still report the bad
initializers, this will be cleanuped later.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
-rw-r--r-- | dissect.c | 4 | ||||
-rw-r--r-- | test-dissect.c | 7 |
2 files changed, 5 insertions, 6 deletions
@@ -125,7 +125,7 @@ static inline struct symbol *no_member(struct ident *name) }; sym.ctype.base_type = &bad_ctype; - sym.ident = name; + sym.ident = name ?: built_in_ident("?"); return &sym; } @@ -135,7 +135,7 @@ static struct symbol *report_member(usage_t mode, struct position *pos, { struct symbol *ret = mem->ctype.base_type; - if (reporter->r_member) + if (mem->ident && reporter->r_member) reporter->r_member(fix_mode(ret, mode), pos, type, mem); return ret; diff --git a/test-dissect.c b/test-dissect.c index 266148be..af1212a0 100644 --- a/test-dissect.c +++ b/test-dissect.c @@ -56,14 +56,13 @@ static void r_symbol(unsigned mode, struct position *pos, struct symbol *sym) static void r_member(unsigned mode, struct position *pos, struct symbol *sym, struct symbol *mem) { - struct ident *ni, *si, *mi; + struct ident *si, *mi; print_usage(pos, sym, mode); - ni = built_in_ident("?"); - si = sym->ident ?: ni; + si = sym->ident ?: built_in_ident("?"); /* mem == NULL means entire struct accessed */ - mi = mem ? (mem->ident ?: ni) : built_in_ident("*"); + mi = mem ? mem->ident : built_in_ident("*"); printf("%.*s.%-*.*s %s\n", si->len, si->name, |