Nikolay Sivov : vkd3d-shader/hlsl: Validate break/continue context.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 72623031a2604249dbd9ae14b883bfd0484e33ef
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/72623031a2604249dbd9ae14b883bf...

Author: Nikolay Sivov 
Date:   Tue Oct 24 21:05:42 2023 +0200

vkd3d-shader/hlsl: Validate break/continue context.

Signed-off-by: Nikolay Sivov

---

libs/vkd3d-shader/hlsl.h      |  2 ++
 libs/vkd3d-shader/hlsl.y      | 42 +++++++++++++++++++++++++++++-------------
 tests/hlsl/switch.shader_test |  4 ++--
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 6200d6b9..bd09e869 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -727,6 +727,8 @@ struct hlsl_scope
     struct hlsl_scope *upper;
     /* The scope was created for the loop statement. */
     bool loop;
+    /* The scope was created for the switch statement. */
+    bool _switch;
 };

struct hlsl_profile_info
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 20802eb2..5fd140fb 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -4640,12 +4640,31 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
     }
 }

-static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope)
+static bool check_continue(struct hlsl_ctx *ctx, const struct hlsl_scope *scope, const struct vkd3d_shader_location *loc)
 {
+    if (scope->_switch)
+    {
+        hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
+                "The 'continue' statement is not allowed in 'switch' statements.");
+        return false;
+    }
+
     if (scope->loop)
-        return scope;
+        return true;

-    return scope->upper ? get_loop_scope(scope->upper) : NULL;
+    if (scope->upper)
+        return check_continue(ctx, scope->upper, loc);
+
+    hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'continue' statement is only allowed in loops.");
+    return false;
+}
+
+static bool is_break_allowed(const struct hlsl_scope *scope)
+{
+    if (scope->loop || scope->_switch)
+        return true;
+
+    return scope->upper ? is_break_allowed(scope->upper) : false;
 }

static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hlsl_ir_switch_case *check, struct list *cases)
@@ -5407,6 +5426,8 @@ loop_scope_start:
 switch_scope_start:
       %empty
         {
+            hlsl_push_scope(ctx);
+            ctx->cur_scope->_switch = true;
         }

var_identifier:
@@ -6244,12 +6265,10 @@ jump_statement:
         {
             struct hlsl_ir_node *jump;

-            /* TODO: allow 'break' in the 'switch' statements. */
-
-            if (!get_loop_scope(ctx->cur_scope))
+            if (!is_break_allowed(ctx->cur_scope))
             {
                 hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
-                        "The 'break' statement must be used inside of a loop.");
+                        "The 'break' statement must be used inside of a loop or a switch.");
             }

if (!($$ = make_empty_block(ctx)))
@@ -6261,13 +6280,8 @@ jump_statement:
     | KW_CONTINUE ';'
         {
             struct hlsl_ir_node *jump;
-            struct hlsl_scope *scope;

-            if (!(scope = get_loop_scope(ctx->cur_scope)))
-            {
-                hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
-                        "The 'continue' statement must be used inside of a loop.");
-            }
+            check_continue(ctx, ctx->cur_scope, &@1);

if (!($$ = make_empty_block(ctx)))
                 YYABORT;
@@ -6411,6 +6425,8 @@ switch_statement:

$$ = $5;
             hlsl_block_add_instr($$, s);
+
+            hlsl_pop_scope(ctx);
         }

switch_case:
diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test
index e41834d7..720672a7 100644
--- a/tests/hlsl/switch.shader_test
+++ b/tests/hlsl/switch.shader_test
@@ -211,7 +211,7 @@ float4 main() : sv_target
 }

% unterminated cases
-[pixel shader fail(sm<6)]
+[pixel shader fail(sm<6) todo]
 uint4 v;

float4 main() : sv_target
@@ -455,7 +455,7 @@ todo draw quad
 probe all rgba (1.0, 2.0, 3.0, 4.0)

% 'continue' is not supported in switches
-[pixel shader fail(sm<6) todo]
+[pixel shader fail(sm<6)]
 uint4 v;

float4 main() : sv_target