dissect: add support for _Generic
PATCH 1/1 dissect: add support for _Generic
No special support needed for _Generic, so just suppress the warning about unknown type.
Before:
$ ./test-dissect validation/generic-functions.c
FILE: validation/generic-functions.c
13:1 def f testf void ( ... ) 13:1 testf def . v a float validation/generic-functions.c:13:1: warning: bad expr->type: 31 13:1 testf -r- . v a float 14:1 def f testd void ( ... ) 14:1 testd def . v a double validation/generic-functions.c:14:1: warning: bad expr->type: 31 14:1 testd -r- . v a double 15:1 def f testl void ( ... ) 15:1 testl def . v a long double
validation/generic-functions.c:15:1: warning: bad expr->type: 31
15:1 testl -r- . v a long double
After:
$ ./test-dissect validation/generic-functions.c
FILE: validation/generic-functions.c
13:1 def f testf void ( ... ) 13:1 testf def . v a float 13:1 testf -r- . v a float 14:1 def f testd void ( ... ) 14:1 testd def . v a double 14:1 testd -r- . v a double 15:1 def f testl void ( ... ) 15:1 testl def . v a long double 15:1 testl -r- . v a long double
--- dissect.c | 1 + 1 file changed, 1 insertion(+)
dissect.c +1 -0
@@ -342,6 +342,7 @@ again:case EXPR_TYPE :// [struct T]; Why ??? case EXPR_VALUE :case EXPR_FVALUE : +case EXPR_GENERIC :break ;case EXPR_LABEL : ret = &label_ctype;
Signature · 1 line
2.25.4
Quoted 2 lines · Alexey Gladkov
No special support needed for
_Generic,
Hmm. I am already sleeping and didn't read the _Generic code yet... but shouldn't dissect() inspect ->control/map/def?
That said,
Quoted 2 lines
so just suppress the warning
about unknown type.
probably better than nothing, lets shut up the warning first.
Oleg.
Quoted 7 lines · Oleg Nesterov
Quoted 2 lines · Alexey Gladkov
No special support needed for
_Generic,Hmm. I am already sleeping and didn't read the
_Genericcode yet... but shouldn'tdissect()inspect ->control/map/def?
Quoted 6 lines
That said,
Quoted 2 lines
so just suppress the warning
about unknown type.probably better than nothing, lets shut up the warning first.
OK, since there is some urgency, I applied it directly but my first reaction was also "eh, you can't just ignore EXPR_GENERIC / pretend it's one of the top-level expression". OTOH, I wonder what can be done without first evaluating (the type of) the controlling expression and the types of the map (if I understand correctly, evaluation is avoided in dissect).
-- Luc
Quoted 4 lines · Luc Van Oostenryck
OTOH, I wonder what can be done without first evaluating (the type of) the controlling expression and the types of the map (if I understand correctly, evaluation is avoided in dissect).
Yes. I'll try to think a bit more, but so far I think I'll simply send the patch below.
Test-case:
void func(void)
{
_Generic(a,
int: b,
void: c,
default: d,
) = e;
}output:
1:6 def f func void ( ... ) 3:18 func --- v a bad type 4:33 func -w- v b bad type 5:33 func -w- v c bad type 6:33 func -w- v d bad type 7:13 func -r- v e bad type
Of course, technically this is wrong, it looks as if all 3 variables are modified. But not that bad imo, dissect doesn't even try to be "precise", and this output still looks useful for the indexing/etc.
Oleg.
dissect.c +11 -1
@@ -342,7 +342,6 @@ again:case EXPR_TYPE :// [struct T]; Why ??? case EXPR_VALUE :case EXPR_FVALUE : -case EXPR_GENERIC :break ;case EXPR_LABEL : ret = &label_ctype;
@@ -472,6 +471,17 @@ again: }while ((expr = expr->down)); } +break ;case EXPR_GENERIC : { +struct type_expression *map; + +do_expression (U_VOID , expr->control); + +for (map = expr->map; map; map = map->next) + ret =do_expression (mode, map->expr); +if (expr->def) + ret =do_expression (mode, expr->def); + } +break ;case EXPR_SYMBOL : ret =report_symbol (mode, expr); }
Quoted 8 lines · Oleg Nesterov
Quoted 4 lines · Luc Van Oostenryck
OTOH, I wonder what can be done without first evaluating (the type of) the controlling expression and the types of the map (if I understand correctly, evaluation is avoided in dissect).
Yes. I'll try to think a bit more, but so far I think I'll simply send the patch below.
...
Quoted 22 lines
Of course, technically this is wrong, it looks as if all 3 variables are modified. But not that bad imo, dissect doesn't even try to be "precise", and this output still looks useful for the indexing/etc.
dissect.c +4
-1@@ -342,7 +342,6 @@ again:case EXPR_TYPE :// [struct T]; Why ??? case EXPR_VALUE :case EXPR_FVALUE : -case EXPR_GENERIC :break ;case EXPR_LABEL : ret = &label_ctype;@@ -472,6 +471,17 @@ again: }while ((expr = expr->down)); } +break ;case EXPR_GENERIC : { +struct type_expression *map; + +do_expression (U_VOID , expr->control);
dissect.c again: · line 487
Quoted 10 lines
dissect.c +7
-0+ +for (map = expr->map; map; map = map->next) + ret =do_expression (mode, map->expr); +if (expr->def) + ret =do_expression (mode, expr->def); + } +break ;case EXPR_SYMBOL : ret =report_symbol (mode, expr); }
Yes, that should do the 'walking'. The returned type will just be quite arbitrary, but I don't know how much it matters.
-- Luc
Quoted 17 lines · Luc Van Oostenryck
Quoted 5 lines
dissect.c +4
-0+break ;case EXPR_GENERIC : { +struct type_expression *map; + +do_expression (U_VOID , expr->control);dissect.c again: · line 487
Quoted 10 lines
dissect.c +7
-0+ +for (map = expr->map; map; map = map->next) + ret =do_expression (mode, map->expr); +if (expr->def) + ret =do_expression (mode, expr->def); + } +break ;case EXPR_SYMBOL : ret =report_symbol (mode, expr); }Yes, that should do the 'walking'.
OK, I am sending this stupid patch. Better than nothing.
Quoted 2 lines
The returned type will just be
quite arbitrary, but I don't know how much it matters.
Of course. And this is not good. For example:
void func(void)
{
struct B *b; struct C *c; struct D *d;
_Generic(a,
int: b,
void*: c,
default: d
) ->mem++;
}output:
1:6 def f func void ( ... ) 3:18 func def . v b struct B * 3:31 func def . v c struct C * 3:44 func def . v d struct D * 4:18 func --- v a bad type 5:33 func --m . v b struct B * 6:33 func --m . v c struct C * 7:33 func --m . v d struct D * 8:11 func -m- m D.mem bad type
But I do not know how to improve it without serious complications, and (so far) I think it doesn't worth the effort.
Oleg.
Quoted 28 lines · Oleg Nesterov
Quoted 2 lines · Luc Van Oostenryck
The returned type will just be
quite arbitrary, but I don't know how much it matters.Of course. And this is not good. For example:
void func(void) { struct B *b; struct C *c; struct D *d; _Generic(a, int: b, void*: c, default: d ) ->mem++; }output:
1:6 def f func void ( ... ) 3:18 func def . v b struct B * 3:31 func def . v c struct C * 3:44 func def . v d struct D * 4:18 func --- v a bad type 5:33 func --m . v b struct B * 6:33 func --m . v c struct C * 7:33 func --m . v d struct D * 8:11 func -m- m D.mem bad type
Quoted 1 line
But I do not know how to improve it without serious complications, and
Are you thinking about calling evaluate_symbol_list() or about something else? What kind of complications?
Quoted 1 line
(so far) I think it doesn't worth the effort.
Yes, _Generic() clearly makes things a bit more complicated here. Same for __auto_type, which is not yet used by the kernel but will probably be soon.
-- Luc
Quoted 30 lines · Luc Van Oostenryck
Quoted 28 lines · Oleg Nesterov
Quoted 2 lines · Luc Van Oostenryck
The returned type will just be
quite arbitrary, but I don't know how much it matters.Of course. And this is not good. For example:
void func(void) { struct B *b; struct C *c; struct D *d; _Generic(a, int: b, void*: c, default: d ) ->mem++; }output:
1:6 def f func void ( ... ) 3:18 func def . v b struct B * 3:31 func def . v c struct C * 3:44 func def . v d struct D * 4:18 func --- v a bad type 5:33 func --m . v b struct B * 6:33 func --m . v c struct C * 7:33 func --m . v d struct D * 8:11 func -m- m D.mem bad type
Quoted 3 lines
Quoted 1 line
But I do not know how to improve it without serious complications, and
Are you thinking about calling
evaluate_symbol_list()
I meant, it is not simple to teach dissect() to handle this case correctly. It understand the types, but for example it doesn't even try to distinguish "int" and "float".
And I would like to avoid evaluate_expression/etc.
Quoted 2 lines
or about
something else?
And something else. See the example above, this code is incomplete and in this case evaluate can't help. Ideally dissect should also report the (possible) usage of B.mem and C.mem.
Quoted 4 lines
Quoted 1 line
(so far) I think it doesn't worth the effort.
Yes,
_Generic()clearly makes things a bit more complicated here. Same for__auto_type,
Yes, but hopefully dissect needs much more simple changes to handle __auto_type.
Thanks,
Oleg.
Quoted 10 lines · Oleg Nesterov
Quoted 5 lines · Luc Van Oostenryck
Quoted 1 line · Oleg Nesterov
But I do not know how to improve it without serious complications, and
Are you thinking about calling
evaluate_symbol_list()I meant, it is not simple to teach
dissect()to handle this case correctly. It understand the types, but for example it doesn't even try to distinguish "int" and "float".
OK, that's fine. It's just like using a super type like 'scalar' or 'basetype' or something.
Quoted 8 lines
And I would like to avoid evaluate_expression/etc.
Quoted 2 lines
or about
something else?And something else. See the example above, this code is incomplete and in this case evaluate can't help. Ideally dissect should also report the (possible) usage of B.mem and C.mem.
OK, I begin to understand. You want your own type evaluation with its own rules. evaluate_expression() and friends would indeed not help.
But I'm afraid that, once _Generic() will be used more extensively in macros, it will create a lot of these 'possible usages' that would, in fact, be irrelevant to the code analyzed, possibly with an explosion of combinations.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
(so far) I think it doesn't worth the effort.
Yes,
_Generic()clearly makes things a bit more complicated here. Same for__auto_type,Yes, but hopefully dissect needs much more simple changes to handle
__auto_type.
Yes, it should.
Thanks for the reply.
--Luc
PATCH 1/1 dissect: support _Generic() a bit more
In reply to Luc Van OostenryckChange do_expression(EXPR_GENERIC) to inspect expr->control/map/def. The is the minimal "better than nothing" change, technically incorrect but still useful for the indexing.
Example:
void func(void)
{
_Generic(a,
int: b,
void: c,
default: d,
) = e;
}output:
1:6 def f func void ( ... ) 3:18 func --- v a bad type 4:33 func -w- v b bad type 5:33 func -w- v c bad type 6:33 func -w- v d bad type 7:13 func -r- v e bad type
--- dissect.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
dissect.c +11 -1
@@ -342,7 +342,6 @@ again:case EXPR_TYPE :// [struct T]; Why ??? case EXPR_VALUE :case EXPR_FVALUE : -case EXPR_GENERIC :break ;case EXPR_LABEL : ret = &label_ctype;
@@ -472,6 +471,17 @@ again: }while ((expr = expr->down)); } +break ;case EXPR_GENERIC : { +struct type_expression *map; + +do_expression (U_VOID , expr->control); + +for (map = expr->map; map; map = map->next) + ret =do_expression (mode, map->expr); +if (expr->def) + ret =do_expression (mode, expr->def); + } +break ;case EXPR_SYMBOL : ret =report_symbol (mode, expr); }
Signature · 1 line
2.25.1.362.g51ebf55
Re: [PATCH] dissect: support _Generic() a bit more
Quoted 3 lines · Oleg Nesterov
Change
do_expression(EXPR_GENERIC)to inspect expr->control/map/def. The is the minimal "better than nothing" change, technically incorrect but still useful for the indexing.
Thanks. Applied & pushed.
-- Luc