March 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Print the previous location for redefinition errors.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: vkd3d Branch: master Commit: 3d5a4f133a72139bb2bcd209c5ba626ef80dadb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3d5a4f133a72139bb2bcd20… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 2 15:34:43 2021 -0600 vkd3d-shader: Print the previous location for redefinition errors. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 89 +++++++++++++++++++++++++----------------------- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 4e73060..0486c95 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -319,6 +319,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u vkd3d_free(type); return NULL; } + field->loc = old_field->loc; field->type = hlsl_type_clone(ctx, old_field->type, default_majority); field->name = vkd3d_strdup(old_field->name); if (old_field->semantic) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 36e7dd0..33eefe9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -130,6 +130,7 @@ struct hlsl_type struct hlsl_struct_field { struct list entry; + struct vkd3d_shader_location loc; struct hlsl_type *type; const char *name; const char *semantic; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 50aeeab..1caeb41 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -286,8 +286,25 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return &cast->node; } +static struct hlsl_ir_function_decl *get_func_entry(struct hlsl_ctx *ctx, const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->functions, name))) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local) { + struct hlsl_ir_function_decl *func; bool ret; if (decl->data_type->type != HLSL_CLASS_MATRIX) @@ -317,10 +334,12 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo } else { - if (hlsl_get_function(ctx, decl->name)) + if ((func = get_func_entry(ctx, decl->name))) { hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Variable '%s' is already defined as a function.", decl->name); + hlsl_note(ctx, func->loc, VKD3D_SHADER_LOG_ERROR, + "\"%s\" was previously defined here.", decl->name); return false; } } @@ -660,17 +679,16 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return add_load(ctx, instrs, array, index, data_type, loc); } -static bool add_struct_field(struct list *fields, struct hlsl_struct_field *field) +static struct hlsl_struct_field *get_struct_field(struct list *fields, const char *name) { struct hlsl_struct_field *f; LIST_FOR_EACH_ENTRY(f, fields, struct hlsl_struct_field, entry) { - if (!strcmp(f->name, field->name)) - return false; + if (!strcmp(f->name, name)) + return f; } - list_add_tail(fields, &field->entry); - return true; + return NULL; } bool hlsl_type_is_row_major(const struct hlsl_type *type) @@ -739,6 +757,7 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->type = hlsl_new_array_type(ctx, type, v->array_size); else field->type = type; + field->loc = v->loc; field->name = v->name; field->modifiers = modifiers; field->semantic = v->semantic; @@ -873,22 +892,6 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct rb_tree *f return NULL; } -static struct hlsl_ir_function_decl *get_func_entry(struct hlsl_ctx *ctx, const char *name) -{ - struct hlsl_ir_function_decl *decl; - struct hlsl_ir_function *func; - struct rb_entry *entry; - - if ((entry = rb_get(&ctx->functions, name))) - { - func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); - RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) - return decl; - } - - return NULL; -} - static struct list *make_list(struct hlsl_ir_node *node) { struct list *list; @@ -1726,14 +1729,14 @@ hlsl_prog: { hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" is already defined.", $2.name); + hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously defined here.", $2.name); YYABORT; } else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) { hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" was already declared with a different return type.", $2.name); - hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, - "\"%s\" previously declared here", $2.name); + hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", $2.name); YYABORT; } } @@ -1840,19 +1843,23 @@ fields_list: } | fields_list field { - bool ret; - struct hlsl_struct_field *field, *next; + struct hlsl_struct_field *field, *next, *existing; $$ = $1; LIST_FOR_EACH_ENTRY_SAFE(field, next, $2, struct hlsl_struct_field, entry) { - ret = add_struct_field($$, field); - if (ret == false) + if ((existing = get_struct_field($$, field->name))) { hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Field \"%s\" is already defined.", field->name); + hlsl_note(ctx, existing->loc, VKD3D_SHADER_LOG_ERROR, + "'%s' was previously defined here.", field->name); vkd3d_free(field); } + else + { + list_add_tail($$, &field->entry); + } } vkd3d_free($2); } @@ -1889,15 +1896,20 @@ func_prototype: /* var_modifiers is necessary to avoid shift/reduce conflicts. */ var_modifiers type var_identifier '(' parameters ')' colon_attribute { + struct hlsl_ir_var *var; + if ($1) { hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Modifiers are not allowed on functions."); YYABORT; } - if (hlsl_get_var(ctx->globals, $3)) + if ((var = hlsl_get_var(ctx->globals, $3))) { - hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" is already defined.", $3); + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "\"%s\" is already declared as a variable.", $3); + hlsl_note(ctx, var->loc, VKD3D_SHADER_LOG_ERROR, + "\"%s\" was previously declared here.", $3); YYABORT; } if (hlsl_type_is_void($2) && $7.semantic) @@ -2565,22 +2577,15 @@ postfix_expr: struct hlsl_type *type = node->data_type; struct hlsl_struct_field *field; - $$ = NULL; - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) - { - if (!strcmp($3, field->name)) - { - if (!add_record_load(ctx, $1, node, field, @2)) - YYABORT; - $$ = $1; - break; - } - } - if (!$$) + if (!(field = get_struct_field(type->e.elements, $3))) { hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Field \"%s\" is not defined.", $3); YYABORT; } + + if (!add_record_load(ctx, $1, node, field, @2)) + YYABORT; + $$ = $1; } else if (node->data_type->type <= HLSL_CLASS_LAST_NUMERIC) {

1 0

Zebediah Figura : vkd3d-shader: Print offending values for more error messages.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: vkd3d Branch: master Commit: 775888273257a65feed14bb10299f5b71cdefa8e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=775888273257a65feed14bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 11:25:08 2021 +0100 vkd3d-shader: Print offending values for more error messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 99 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1caeb41..f1db9be 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1021,10 +1021,25 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type enum hlsl_base_type base; unsigned int dimx, dimy; - if (t1->type > HLSL_CLASS_LAST_NUMERIC || t2->type > HLSL_CLASS_LAST_NUMERIC) + if (t1->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Non-numeric types cannot be used in expressions."); + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(&ctx->string_buffers, t1))) + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Expression of type \"%s\" cannot be used in a numeric expression.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + return NULL; + } + + if (t2->type > HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(&ctx->string_buffers, t2))) + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Expression of type \"%s\" cannot be used in a numeric expression.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); return NULL; } @@ -1033,8 +1048,15 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if (!expr_compatible_data_types(t1, t2)) { - hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Expression data types are incompatible."); + struct vkd3d_string_buffer *t1_string = hlsl_type_to_string(&ctx->string_buffers, t1); + struct vkd3d_string_buffer *t2_string = hlsl_type_to_string(&ctx->string_buffers, t2); + + if (t1_string && t2_string) + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Expression data types \"%s\" and \"%s\" are incompatible.", + t1_string->buffer, t2_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, t1_string); + vkd3d_string_buffer_release(&ctx->string_buffers, t2_string); return NULL; } @@ -1325,7 +1347,8 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru if (initializer_size(initializer) != hlsl_type_component_count(type)) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of parameters in struct initializer."); + "Expected %u components in initializer, but got %u.", + hlsl_type_component_count(type), initializer_size(initializer)); free_parse_initializer(initializer); return; } @@ -1438,7 +1461,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (size < type->dimx * type->dimy) { hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of parameters in numeric initializer."); + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, size); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -1448,7 +1472,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t && hlsl_type_component_count(type) != size) { hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of parameters in initializer."); + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -2050,7 +2074,12 @@ input_mods: { if ($1 & $2) { - hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Duplicate modifiers specified."); + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, $2))) + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifier \"%s\" was already specified.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); YYABORT; } $$ = $1 | $2; @@ -2079,14 +2108,19 @@ type: { if ($3->type != HLSL_CLASS_SCALAR) { - hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Vectors of non-scalar types are not allowed."); + struct vkd3d_string_buffer *string; + + string = hlsl_type_to_string(&ctx->string_buffers, $3); + if (string) + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Vector base type %s is not scalar.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); YYABORT; } if ($5 < 1 || $5 > 4) { hlsl_error(ctx, @5, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, - "Vector size must be between 1 and 4."); + "Vector size %d is not between 1 and 4.", $5); YYABORT; } @@ -2096,20 +2130,25 @@ type: { if ($3->type != HLSL_CLASS_SCALAR) { - hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Matrices of non-scalar types are not allowed."); + struct vkd3d_string_buffer *string; + + string = hlsl_type_to_string(&ctx->string_buffers, $3); + if (string) + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Matrix base type %s is not scalar.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); YYABORT; } if ($5 < 1 || $5 > 4) { hlsl_error(ctx, @5, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, - "Matrix row count must be between 1 and 4."); + "Matrix row count %d is not between 1 and 4.", $5); YYABORT; } if ($7 < 1 || $7 > 4) { hlsl_error(ctx, @7, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, - "Matrix column count must be between 1 and 4."); + "Matrix column count %d is not between 1 and 4.", $7); YYABORT; } @@ -2279,7 +2318,7 @@ array: if (size > 65536) { hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, - "Array size must be between 1 and 65536."); + "Array size %u is not between 1 and 65536.", size); YYABORT; } $$ = size; @@ -2430,8 +2469,14 @@ selection_statement: vkd3d_free($5.then_instrs); vkd3d_free($5.else_instrs); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) - hlsl_error(ctx, instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "if condition requires a scalar."); + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(&ctx->string_buffers, condition->data_type))) + hlsl_error(ctx, instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "if condition type %s is not scalar.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } $$ = $3; list_add_tail($$, &instr->node.entry); } @@ -2644,8 +2689,12 @@ postfix_expr: } if ($2->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Constructors may only be used with numeric data types."); + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(&ctx->string_buffers, $2))) + hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Constructor data type %s is not numeric.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); YYABORT; } if ($2->dimx * $2->dimy != initializer_size(&$4)) @@ -2669,8 +2718,12 @@ postfix_expr: if (arg->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_error(ctx, arg->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Invalid type for constructor argument."); + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(&ctx->string_buffers, arg->data_type))) + hlsl_error(ctx, arg->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s for constructor argument.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); continue; } width = hlsl_type_component_count(arg->data_type);

1 0

Zebediah Figura : vkd3d-shader: Move some functions into hlsl_codegen.c.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: vkd3d Branch: master Commit: df5e4a865c8ec7205fe95502c3ec2a8a5b67eef5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=df5e4a865c8ec7205fe9550… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 2 15:34:46 2021 -0600 vkd3d-shader: Move some functions into hlsl_codegen.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 153 +-------------------------------- libs/vkd3d-shader/hlsl_codegen.c | 177 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=df5e4a865c8ec7205fe…

1 0

Zebediah Figura : vkd3d-shader: Remove a duplicate check for semantics on void functions.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: vkd3d Branch: master Commit: d423f8f46986ccaaff91e3d759311ed2a1bc75ef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d423f8f46986ccaaff91e3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 2 15:34:45 2021 -0600 vkd3d-shader: Remove a duplicate check for semantics on void functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f1db9be..d733a9b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1765,10 +1765,6 @@ hlsl_prog: } } - if (hlsl_type_is_void($2.decl->return_type) && $2.decl->semantic) - hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, - "Semantics are not allowed on void functions."); - hlsl_add_function(&ctx->functions, $2.name, $2.decl, false); } | hlsl_prog declaration_statement

1 0

Zebediah Figura : vkd3d-shader: Use %empty.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: vkd3d Branch: master Commit: 2fe6d26dfccea478e84497d5f6dfdf716438b363 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2fe6d26dfccea478e84497d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 2 15:34:42 2021 -0600 vkd3d-shader: Use %empty. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1341de1..50aeeab 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1714,7 +1714,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %% hlsl_prog: - /* empty */ + %empty | hlsl_prog func_declaration { const struct hlsl_ir_function_decl *decl; @@ -1833,7 +1833,7 @@ any_identifier: | NEW_IDENTIFIER fields_list: - /* empty */ + %empty { if (!($$ = make_empty_list())) YYABORT; @@ -1930,7 +1930,7 @@ compound_statement: } scope_start: - /* empty */ + %empty { hlsl_push_scope(ctx); } @@ -1940,7 +1940,7 @@ var_identifier: | NEW_IDENTIFIER colon_attribute: - /* empty */ + %empty { $$.semantic = NULL; $$.reg_reservation = NULL; @@ -2030,7 +2030,7 @@ parameter: } input_mods: - /* empty */ + %empty { $$ = 0; } @@ -2206,7 +2206,7 @@ declaration: } variables_def_optional: - /* empty */ + %empty { $$ = NULL; } @@ -2247,7 +2247,7 @@ variable_def: } array: - /* empty */ + %empty { $$ = 0; } @@ -2274,7 +2274,7 @@ array: } var_modifiers: - /* empty */ + %empty { $$ = 0; }

1 0

Francois Gouget : testbot/web: Fix the task count on the index page.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: tools Branch: master Commit: 13939bdc2e8dc09154037527b7d79ee8c5a19d77 URL: https://source.winehq.org/git/tools.git/?a=commit;h=13939bdc2e8dc0915403752… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 4 14:26:02 2021 +0100 testbot/web: Fix the task count on the index page. Tasks that have not started yet must be counted too! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 603f295..1336d1e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -239,6 +239,8 @@ package StatusPage; use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); +use ObjectModel::Collection; + use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; @@ -357,7 +359,8 @@ sub GenerateBody($) # pretty rare queued jobs. But doing so one job at a time is inefficient so # do it all at once now and store the results in ...->{JobsInfo}. my $Tasks = CreateTasks(); - $Tasks->AddFilter("Started", [$CutOff], ">="); + $Tasks->AddFilter(FilterOr(FilterValue("Started", ">=", [$CutOff]), + FilterNull("Started"))); foreach my $Task (@{$Tasks->GetItems()}) { my $JobInfo = ($JobsCollectionBlock->{JobsInfo}->{$Task->JobId} ||= {});

1 0

Francois Gouget : testbot/LogUtils: Add support for IgnoreExceptions.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: tools Branch: master Commit: 34119af362f677d8e64be0577be3f8cdc1f340f6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=34119af362f677d8e64be05… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 4 14:27:30 2021 +0100 testbot/LogUtils: Add support for IgnoreExceptions. Any exception occurring while IgnoreExceptions=1 is expected and should be ignored. Note that this is made possible by the fact that ParseWineTestReport() is now the sole authority on what is a report error line, and thus won't be contradicted by GetReportLineCategory() (which lacks the context information to deal with IgnoreExceptions directives). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 56 ++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0bd7d19..bdba8da 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -611,44 +611,60 @@ sub ParseWineTestReport($$$) _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: IgnoreExceptions=([01])/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+: IgnoreExceptions=([01])/) + { + my ($Unit, $Ignore) = ($1, $2); + _CheckUnit($LogInfo, $Cur, $Unit, "ignore exceptions"); + $Cur->{IgnoreExceptions} = $Ignore; + } elsif (($Cur->{Unit} ne "" and $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /) or $Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) { my ($Pid, $Unit) = ($1, $2); - - if ($Cur->{Units}->{$Unit}) + _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); + if (!$Cur->{IgnoreExceptions}) { - # This also replaces a test summary line. - $Cur->{Pids}->{$Pid || 0} = 1; - $Cur->{SummaryFailures}++; + if ($Cur->{Units}->{$Unit}) + { + # This also replaces a test summary line. + $Cur->{Pids}->{$Pid || 0} = 1; + $Cur->{SummaryFailures}++; + } + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; } - _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - $Cur->{LineFailures}++; } elsif ($Line =~ /Unhandled exception: .* in .* code /) { - # This also replaces a test summary line. The pid is unknown so use 0. - $Cur->{Pids}->{0} = 1; - $Cur->{SummaryFailures}++; - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - $Cur->{LineFailures}++; + if (!$Cur->{IgnoreExceptions}) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $Cur->{Pids}->{0} = 1; + $Cur->{SummaryFailures}++; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; + } } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or $Line =~ /^([_.a-z0-9]+)\.c:\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) { my ($Unit, $Pid) = ($1, $2); - if ($Cur->{Units}->{$Unit}) + _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); + if (!$Cur->{IgnoreExceptions}) { - # This also replaces a test summary line. - $Cur->{Pids}->{$Pid || 0} = 1; - $Cur->{SummaryFailures}++; + if ($Cur->{Units}->{$Unit}) + { + # This also replaces a test summary line. + $Cur->{Pids}->{$Pid || 0} = 1; + $Cur->{SummaryFailures}++; + } + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; } - _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); - $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or

1 0

Francois Gouget : winetest/dissect: Don't close nonexistent test units.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: tools Branch: master Commit: 4591bc9dac2689a66700e2b1bb7f5bf3ae53dc6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=4591bc9dac2689a66700e2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 4 13:55:24 2021 +0100 winetest/dissect: Don't close nonexistent test units. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index fc83726..7f4f327 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -770,7 +770,7 @@ while ($line = <IN>) { # And close the current test unit taking into account # it may have been polluted by the new one. $broken = 1; - close_test_unit(0); + close_test_unit(0) if ($dll ne ""); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have

1 0

Francois Gouget : testbot/LogUtils: Don't close nonexistent test units.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: tools Branch: master Commit: 7cc1dd45039e18a53edabaf87f37399488cfa715 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7cc1dd45039e18a53edabaf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 4 13:55:21 2021 +0100 testbot/LogUtils: Don't close nonexistent test units. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4d2619c..0bd7d19 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -683,7 +683,7 @@ sub ParseWineTestReport($$$) # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($LogInfo, $Cur, 0); + _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have

1 0

Francois Gouget : testbot: Allow for more complex Collection filtering.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: tools Branch: master Commit: bbb88465eca88183b973e318990b12f68123525b URL: https://source.winehq.org/git/tools.git/?a=commit;h=bbb88465eca88183b973e31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 4 14:23:26 2021 +0100 testbot: Allow for more complex Collection filtering. The previous scheme used an implicit AND between all the property filters, with no way of replacing it with an OR. The new scheme makes it possible to create almost any where clause (excluding joins). For instance this makes it possible to get all the Jobs that were submitted or completed recently: $Jobs->AddFilter(FilterOr(FilterValue("Submitted", ">=", [$Recent]]), FilterValue("Ended", ">=", [$Recent]))); Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 98 +++++++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 158 ++++++++++++++++++++++++---------- 2 files changed, 201 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1fe1481..782f32c 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014 Francois Gouget +# Copyright 2012-2014, 2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,7 @@ criteria. =cut use Exporter 'import'; +our @EXPORT = qw(FilterValue FilterNull FilterNotNull FilterAnd FilterOr FilterNot); our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(blessed weaken); @@ -90,7 +91,7 @@ sub new($$$$$;$$@) MasterColNames => $MasterColNames, MasterColValues => $MasterColValues, MasterKey => ComputeMasterKey($MasterColValues), - Filters => {}, + Filter => undef, AllScopeItems => $AllScopeItems || {}, Items => undef}; if ($AllScopeItems) @@ -692,18 +693,99 @@ sub DeleteAll($) return undef; } -sub AddFilter($$$;$) + +# +# Item filtering +# + +my %FilterTypes = ( + 'value' => 1, + 'null' => 1, + 'not null' => 1, + 'and' => 1, + 'or' => 1, + 'not' => 1, +); + +my %ValueComparators = ( + '=' => 1, + '<>' => 1, + '<' => 1, + '<=' => 1, + '>' => 1, + '>=' => 1, + 'LIKE' => 1, + 'NOT LIKE' => 1, +); + +sub FilterValue($$$) { - my ($self, $PropertyName, $Values, $Type) = @_; + my ($PropertyName, $Comparator, $Values) = @_; - $self->{Filters}{$PropertyName} = [($Type || "="), $Values]; + die "unknown '$Comparator' comparator" if (!$ValueComparators{$Comparator}); + return { Type => 'value', + Property => $PropertyName, + Comparator => $Comparator, + Values => $Values, + }; } -sub GetFilters($) +sub FilterNull($) { - my ($self) = @_; + my ($PropertyName) = @_; + + return { Type => 'null', Property => $PropertyName }; +} + +sub FilterNotNull($) +{ + my ($PropertyName) = @_; + + return { Type => 'not null', Property => $PropertyName }; +} + +sub FilterAnd(@) +{ + return { Type => 'and', Terms => [@_] }; +} + +sub FilterOr(@) +{ + + return { Type => 'or', Terms => [@_] }; +} + +sub FilterNot($) +{ + my ($Term) = @_; + + return { Type => 'not', Term => $Term }; +} + +sub AddFilter($$;$$) +{ + my $self = shift; + my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + + if (!$self->{Filter}) + { + $self->{Filter} = $Filter; + } + elsif ($self->{Filter}->{Type} eq 'and') + { + push @{$self->{Filter}->{Terms}}, $Filter; + } + else + { + $self->{Filter} = FilterAnd($self->{Filter}, $Filter); + } +} + +sub GetFilter($) +{ + my ($self, $PropertyName, $Values, $Type) = @_; - return $self->{Filters}; + return $self->{Filter}; } 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 88ecf85..10cc1f3 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -1,6 +1,6 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Copyright 2009 Ge van Geldorp -# Copyright 2012, 2014 Francois Gouget +# Copyright 2012, 2014, 2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -174,15 +174,108 @@ sub BuildFieldList($$) return $Fields; } -my %_AllowedFilterTypes = ( - "=" => 1, - "<>" => 1, - "<" => 1, - "<=" => 1, - ">" => 1, - ">=" => 1, - "LIKE" => 1, -); +sub ColNameToDb($) +{ + my ($PropertyDescriptor) = @_; + + my $ColNames = $PropertyDescriptor->GetColNames(); + if (@$ColNames != 1) + { + die "cannot filter on Itemref with more than one column name: @$ColNames"; + } + return $ColNames->[0]; +} + +=pod +=over 12 + +=item C<GetFilterWhere()> + +Builds the WHERE clause and its associated data parameter from the specified +collection and filter tree. + +Returns a triplet composed of a boolean which is true if the returned WHERE +clause is composite, that is if it should be enclosed in parentheses before +being combined with other filters ; the WHERE clause string ; and a reference +to the data array. + +=back +=cut + +sub GetFilterWhere($$$); +sub GetFilterWhere($$$) +{ + my ($self, $Collection, $Filter) = @_; + + if ($Filter->{Type} eq 'value') + { + my $Values = $Filter->{Values}; + if (!$Values or @$Values == 0) + { + die "no values for the $Filter->{Property} $Filter->{Comparator} property filter"; + } + + my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); + my (@Wheres, @Data); + foreach my $ColValue (@$Values) + { + my $ColName = ColNameToDb($PropertyDescriptor); + push @Wheres, "$ColName $Filter->{Comparator} ?"; + + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + $ColValue = $ColValue->GetKey(); + } + push @Data, $self->ToDb($ColValue, $PropertyDescriptor); + } + return (@$Values > 1, join(" OR ", @Wheres), \@Data); + } + + if ($Filter->{Type} eq 'and' or $Filter->{Type} eq 'or') + { + my $Terms = $Filter->{Terms}; + if (!$Terms or !@$Terms) + { + die "no terms for the $Filter->{Type} filter"; + } + if (@$Terms == 1) + { + return GetFilterWhere($self, $Collection, $Terms->[0]); + } + + my (@Wheres, @Data); + foreach my $Term (@$Terms) + { + my ($Composite, $TermWhere, $TermData) = GetFilterWhere($self, $Collection, $Term); + push @Wheres, ($Composite ? "($TermWhere)" : $TermWhere); + push @Data, @$TermData; + } + + my $Operator = ($Filter->{Type} eq 'and' ? " AND " : " OR "); + return (1, join($Operator, @Wheres), \@Data); + } + + if ($Filter->{Type} eq 'null' or $Filter->{Type} eq 'not null') + { + my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($Filter->{Property}); + my $ColName = ColNameToDb($PropertyDescriptor); + my $Operator = ($Filter->{Type} eq 'null' ? "IS NULL" : "IS NOT NULL"); + return (0, "$ColName $Operator", []); + } + + if ($Filter->{Type} eq 'not') + { + if (!$Filter->{Term}) + { + die "no term for the not filter"; + } + my ($Composite, $TermWhere, $TermData) = GetFilterWhere($self, $Collection, $Filter->{Term}); + # To avoid confusion add parentheses even it the term is not composite + return (0, "NOT ($TermWhere)", $TermData); + } + + die "unsupported '$Filter->{Type}' filter type"; +} sub LoadCollection($$) { @@ -199,48 +292,19 @@ sub LoadCollection($$) push @Data, @{$MasterColValues}; } - my $Filters = $Collection->GetFilters(); - foreach my $FilterProperty (keys %$Filters) + my $Filter = $Collection->GetFilter(); + if ($Filter) { + my ($Composite, $FilterWhere, $FilterData) = GetFilterWhere($self, $Collection, $Filter); if ($Where ne "") { - $Where .= " AND "; - } - my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($FilterProperty); - my ($FilterType, $FilterValues) = @{$Filters->{$FilterProperty}}; - if (!$_AllowedFilterTypes{$FilterType}) - { - die "unknown '$FilterType' filter type"; - } - if (!@$FilterValues) - { - die "no values for the '$FilterType' filter"; - } - - if (@$FilterValues != 1) - { - $Where .= "("; - } - foreach my $FilterIndex (0 .. @$FilterValues - 1) - { - if ($FilterIndex != 0) - { - $Where .= " OR "; - } - my $ColValue = $FilterValues->[$FilterIndex]; - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - $ColValue = $ColValue->GetKey(); - } - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) - { - $Where .= "$ColName $FilterType ?"; - $Data[@Data] = $self->ToDb($ColValue, $PropertyDescriptor); - } + $Where .= ($Composite ? " AND ($FilterWhere)" : " AND $FilterWhere"); + push @Data, @$FilterData; } - if (@$FilterValues != 1) + else { - $Where .= ")"; + $Where = $FilterWhere; + @Data = @$FilterData; } }

1 0