[PATCH v20 4/8] vkd3d-shader/hlsl: Validate break/continue context.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl.h      |  2 ++
 libs/vkd3d-shader/hlsl.y      | 30 +++++++++++++++++++++---------
 tests/hlsl/switch.shader_test |  4 ++--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index d9b5e0ebf..d66242d23 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 dcaca929f..75341be82 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -4640,12 +4640,23 @@ 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 is_continue_allowed(const struct hlsl_scope *scope)
 {
+    if (scope->_switch)
+        return false;
+
     if (scope->loop)
-        return scope;
+        return true;
+
+    return scope->upper ? is_continue_allowed(scope->upper) : false;
+}
+
+static bool is_break_allowed(const struct hlsl_scope *scope)
+{
+    if (scope->loop || scope->_switch)
+        return true;

-    return scope->upper ? get_loop_scope(scope->upper) : NULL;
+    return scope->upper ? is_break_allowed(scope->upper) : false;
 }

}
@@ -5370,6 +5381,8 @@ loop_scope_start:
 switch_scope_start:
       %empty
         {
+            hlsl_push_scope(ctx);
+            ctx->cur_scope->_switch = true;
         }

var_identifier:
@@ -6197,12 +6210,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)))
@@ -6214,9 +6225,8 @@ jump_statement:
     | KW_CONTINUE ';'
         {
             struct hlsl_ir_node *jump;
-            struct hlsl_scope *scope;

-            if (!(scope = get_loop_scope(ctx->cur_scope)))
+            if (!is_continue_allowed(ctx->cur_scope))
             {
                 hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
                         "The 'continue' statement must be used inside of a loop.");
@@ -6364,6 +6374,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 39bfaacbc..c51e51268 100644
--- a/tests/hlsl/switch.shader_test
+++ b/tests/hlsl/switch.shader_test
@@ -183,7 +183,7 @@ float4 main() : sv_target
 }

% unterminated cases
-[pixel shader fail]
+[pixel shader fail todo]
 uint4 v;

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

% 'continue' is not supported in switches
-[pixel shader fail todo]
+[pixel shader fail]
 uint4 v;

float4 main() : sv_target