Mesa (main): intel: fix leaking memory on shader creation

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 974c58b317d1185a53c6753faf24bedae859fa0b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=974c58b317d1185a53c6753faf24bedae859fa0b

Author: Yevhenii Kolesnikov <yevhenii.kolesnikov at globallogic.com>
Date:   Tue Jun 29 18:49:42 2021 +0300

intel: fix leaking memory on shader creation

ralloc_adopt takes care of all the shader's children, but shader itsel ends up
orphaned and never gets free'd.

Fixes: ef5bce9253e ("intel: Drop the last uses of a mem_ctx in nir_builder_init_simple_shader().")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4951

Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov at globallogic.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11651>

---

 src/intel/blorp/blorp_nir_builder.h | 2 +-
 src/intel/compiler/brw_nir.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/blorp/blorp_nir_builder.h b/src/intel/blorp/blorp_nir_builder.h
index 6fbe1deb5ad..17da4d60086 100644
--- a/src/intel/blorp/blorp_nir_builder.h
+++ b/src/intel/blorp/blorp_nir_builder.h
@@ -30,7 +30,7 @@ blorp_nir_init_shader(nir_builder *b,
                       const char *name)
 {
    *b = nir_builder_init_simple_shader(stage, NULL, "%s", name ? name : "");
-   ralloc_adopt(mem_ctx, b->shader);
+   ralloc_steal(mem_ctx, b->shader);
    if (stage == MESA_SHADER_FRAGMENT)
       b->shader->info.fs.origin_upper_left = true;
 }
diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 6169fe99fbf..ea9ce6df643 100644
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -1523,7 +1523,7 @@ brw_nir_create_passthrough_tcs(void *mem_ctx, const struct brw_compiler *compile
 {
    nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_TESS_CTRL,
                                                   options, "passthrough TCS");
-   ralloc_adopt(mem_ctx, b.shader);
+   ralloc_steal(mem_ctx, b.shader);
    nir_shader *nir = b.shader;
    nir_variable *var;
    nir_ssa_def *load;