From 7d521db3db5e5904808077ea979b8582741b2835 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Tue, 2 May 2023 16:23:35 -0500
Subject: [PATCH] vkd3d-shader/hlsl: Merge the "discard_statement" rule into
 "jump_statement".

---
 libs/vkd3d-shader/hlsl.y | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 59744796..c9da3827 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -4431,7 +4431,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type
 %type <list> conditional_expr
 %type <list> declaration
 %type <list> declaration_statement
-%type <list> discard_statement
 %type <list> equality_expr
 %type <list> expr
 %type <list> expr_optional
@@ -5741,7 +5740,6 @@ statement:
       declaration_statement
     | expr_statement
     | compound_statement
-    | discard_statement
     | jump_statement
     | selection_statement
     | loop_statement
@@ -5760,9 +5758,7 @@ jump_statement:
             if (!add_return(ctx, $$, NULL, &@1))
                 YYABORT;
         }
-
-discard_statement:
-      KW_DISCARD ';'
+    | KW_DISCARD ';'
         {
             struct hlsl_ir_node *discard, *c;