d3dcompiler: Don't set the node type for return instructions.

Essentially just because it doesn't make sense to do so; a return instruction is not an expression usable as a source to other instructions. Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dcompiler: Don't set the node type for return instructions.
1947f7fb · Zebediah Figura · Alexandre Julliard · 09b2e42e · 1947f7fb
Commit 1947f7fb authored Mar 01, 2020 by Zebediah Figura Committed by Alexandre Julliard Mar 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

hlsl.y dlls/d3dcompiler_43/hlsl.y +3 -3

No files found.
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -483,6 +483,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha

 static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source_location loc)
 {
+    struct hlsl_type *return_type = hlsl_ctx.cur_function->return_type;
    struct hlsl_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump));
    if (!jump)
    {
@@ -492,16 +493,15 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source
    jump->node.type = HLSL_IR_JUMP;
    jump->node.loc = loc;
    jump->type = HLSL_IR_JUMP_RETURN;
-    jump->node.data_type = hlsl_ctx.cur_function->return_type;
    if (value)
    {
-        if (!(jump->return_value = implicit_conversion(value, jump->node.data_type, &loc)))
+        if (!(jump->return_value = implicit_conversion(value, return_type, &loc)))
        {
            d3dcompiler_free(jump);
            return NULL;
        }
    }
-    else if (jump->node.data_type->base_type != HLSL_TYPE_VOID)
+    else if (return_type->base_type != HLSL_TYPE_VOID)
    {
        hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR,
                "non-void function must return a value");