From 9cc7aaf5a1b3fc4037870635dd305c438ff13361 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Fri, 10 Sep 2021 16:36:36 -0500
Subject: [PATCH] vkd3d-shader/hlsl: Forbid returning void expressions from
 void functions.

---
 libs/vkd3d-shader/hlsl.y        | 26 +++++++++++++++++---------
 tests/hlsl-function.shader_test |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index fc0849c7..2d5640aa 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -599,21 +599,29 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs
     struct hlsl_type *return_type = ctx->cur_function->return_type;
     struct hlsl_ir_jump *jump;
 
-    if (return_value)
+    if (ctx->cur_function->return_var)
     {
-        struct hlsl_ir_store *store;
+        if (return_value)
+        {
+            struct hlsl_ir_store *store;
 
-        if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, &loc)))
-            return NULL;
+            if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, &loc)))
+                return NULL;
 
-        if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value)))
+            if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value)))
+                return NULL;
+            list_add_after(&return_value->entry, &store->node.entry);
+        }
+        else
+        {
+            hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void functions must return a value.");
             return NULL;
-        list_add_after(&return_value->entry, &store->node.entry);
+        }
     }
-    else if (ctx->cur_function->return_var)
+    else
     {
-        hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void function must return a value.");
-        return NULL;
+        if (return_value)
+            hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Void functions cannot return a value.");
     }
 
     if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, loc)))
diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test
index 3f4908ec..e8bb80c4 100644
--- a/tests/hlsl-function.shader_test
+++ b/tests/hlsl-function.shader_test
@@ -89,7 +89,7 @@ float4 main() : sv_target
     return func();
 }
 
-[pixel shader fail todo]
+[pixel shader fail]
 
 void foo()
 {