From ec910d2e24f06a2effaa6c580ab008adb8e6dac2 Mon Sep 17 00:00:00 2001 From: Yevhenii Kolesnikov Date: Tue, 29 Jun 2021 18:49:42 +0300 Subject: [PATCH] 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 Reviewed-by: Emma Anholt Part-of: (cherry picked from commit 974c58b317d1185a53c6753faf24bedae859fa0b) --- .pick_status.json | 2 +- src/intel/blorp/blorp_nir_builder.h | 2 +- src/intel/compiler/brw_nir.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 314f29f553e..6668cbbb22f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4882,7 +4882,7 @@ "description": "intel: fix leaking memory on shader creation", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ef5bce9253e2221ef8df0764447cb02c02fa2a16" }, 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 c48350e5a11..8a1a6779c0e 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -1504,7 +1504,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;