Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_loop().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 8485b2ee95ac6d5c8101c2d559e96e11c07691e9
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/8485b2ee95ac6d5c8101c2d559e96e...

Author: Zebediah Figura 
Date:   Thu Nov 10 20:36:14 2022 -0600

vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_loop().

---

libs/vkd3d-shader/hlsl.c | 8 ++++----
 libs/vkd3d-shader/hlsl.h | 2 +-
 libs/vkd3d-shader/hlsl.y | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 71bf0daa..ab41849e 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1403,7 +1403,7 @@ struct hlsl_ir_node *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type
     return &jump->node;
 }

-struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx,
+struct hlsl_ir_node *hlsl_new_loop(struct hlsl_ctx *ctx,
         struct hlsl_block *block, const struct vkd3d_shader_location *loc)
 {
     struct hlsl_ir_loop *loop;
@@ -1413,7 +1413,7 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx,
     init_node(&loop->node, HLSL_IR_LOOP, NULL, loc);
     hlsl_block_init(&loop->body);
     hlsl_block_add_block(&loop->body, block);
-    return loop;
+    return &loop->node;
 }

struct clone_instr_map
@@ -1573,7 +1573,7 @@ static struct hlsl_ir_node *clone_load(struct hlsl_ctx *ctx, struct clone_instr_

static struct hlsl_ir_node *clone_loop(struct hlsl_ctx *ctx, struct clone_instr_map *map, struct hlsl_ir_loop *src)
 {
-    struct hlsl_ir_loop *dst;
+    struct hlsl_ir_node *dst;
     struct hlsl_block body;

if (!clone_block(ctx, &body, &src->body, map))
@@ -1584,7 +1584,7 @@ static struct hlsl_ir_node *clone_loop(struct hlsl_ctx *ctx, struct clone_instr_
         hlsl_block_cleanup(&body);
         return NULL;
     }
-    return &dst->node;
+    return dst;
 }

static struct hlsl_ir_node *clone_resource_load(struct hlsl_ctx *ctx,
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 68e3850c..a18d49c6 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -1109,7 +1109,7 @@ bool hlsl_index_is_noncontiguous(struct hlsl_ir_index *index);

struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *val,
         struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc);
-struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx,
+struct hlsl_ir_node *hlsl_new_loop(struct hlsl_ctx *ctx,
         struct hlsl_block *block, const struct vkd3d_shader_location *loc);
 struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx,
         const struct hlsl_resource_load_params *params, const struct vkd3d_shader_location *loc);
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index c2f47b80..635b6fab 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -458,8 +458,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att
 static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const struct parse_attribute_list *attributes, struct list *init, struct list *cond,
         struct list *iter, struct list *body, const struct vkd3d_shader_location *loc)
 {
-    struct hlsl_ir_loop *loop = NULL;
     struct hlsl_block body_block;
+    struct hlsl_ir_node *loop;
     unsigned int i;

if (attribute_list_has_duplicates(attributes))
@@ -513,14 +513,13 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, const

if (!(loop = hlsl_new_loop(ctx, &body_block, loc)))
         goto oom;
-    list_add_tail(init, &loop->node.entry);
+    list_add_tail(init, &loop->entry);

vkd3d_free(cond);
     vkd3d_free(body);
     return init;

oom:
-    vkd3d_free(loop);
     destroy_instr_list(init);
     destroy_instr_list(cond);
     destroy_instr_list(iter);