Mesa (master): radeonsi: always return void from si_build_wrapper_function

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0aba1743611109545bba86bf055a04ecbe210132
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aba1743611109545bba86bf055a04ecbe210132

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Nov 14 00:59:56 2020 -0500

radeonsi: always return void from si_build_wrapper_function

It's the end of the shader, there are no return values.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7623>

---

 src/gallium/drivers/radeonsi/si_shader_llvm.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c
index d327e8a524d..3a69d1d9006 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c
@@ -732,9 +732,6 @@ void si_build_wrapper_function(struct si_shader_context *ctx, LLVMValueRef *part
    if (ctx->stage == MESA_SHADER_TESS_CTRL && si_is_multi_part_shader(ctx->shader))
       ac_build_endif(&ctx->ac, 6507);
 
-   /* Return the value from the last part. */
-   if (LLVMGetTypeKind(LLVMTypeOf(ret)) == LLVMVoidTypeKind)
-      LLVMBuildRetVoid(builder);
-   else
-      LLVMBuildRet(builder, ret);
+   assert(LLVMGetTypeKind(LLVMTypeOf(ret)) == LLVMVoidTypeKind);
+   LLVMBuildRetVoid(builder);
 }