| Message ID | 20200902125752.1033524-1-laurent@vivier.eu |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] linux-user: fix implicit conversion from enumeration type error | expand |
On 9/2/20 5:57 AM, Laurent Vivier wrote: > MK_ARRAY(type,size) is used to fill the field_types buffer, and if the > "size" parameter is an enum type, clang [-Werror,-Wenum-conversion] reports > an error when it is assigned to field_types which is also an enum, argtypes. > > To avoid that, convert "size" to "int" in MK_ARRAY(). "int" is the type > used for the size evaluation in thunk_type_size(). > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h index a5bbb2c73331..b281dfa30f8c 100644 --- a/include/exec/user/thunk.h +++ b/include/exec/user/thunk.h @@ -42,7 +42,7 @@ typedef enum argtype { } argtype; #define MK_PTR(type) TYPE_PTR, type -#define MK_ARRAY(type, size) TYPE_ARRAY, size, type +#define MK_ARRAY(type, size) TYPE_ARRAY, (int)(size), type #define MK_STRUCT(id) TYPE_STRUCT, id #define THUNK_TARGET 0
MK_ARRAY(type,size) is used to fill the field_types buffer, and if the "size" parameter is an enum type, clang [-Werror,-Wenum-conversion] reports an error when it is assigned to field_types which is also an enum, argtypes. To avoid that, convert "size" to "int" in MK_ARRAY(). "int" is the type used for the size evaluation in thunk_type_size(). Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- Notes: v2: put "size" in parentheses as it can be an expression include/exec/user/thunk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)