From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 5 Jun 2012 22:58:41 +0000 (-0700)
Subject: glsl: Hook up loop_variable_state destructor to plug a memory leak.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3603fdcebfa25e2217f1dbfb0a99261be3e84b02;p=mesa.git

glsl: Hook up loop_variable_state destructor to plug a memory leak.

While ~loop_state() is already freeing the loop_variable_state objects
via ralloc_free(this->mem_ctx), the ~loop_variable_state() destructor
was never getting called, so the hash table inside loop_variable_state
was never getting destroyed.

Fixes a memory leak in any shader with loops.

NOTE: This is a candidate for stable release branches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/loop_analysis.h b/src/glsl/loop_analysis.h
index 8bed1db0210..05c982fc164 100644
--- a/src/glsl/loop_analysis.h
+++ b/src/glsl/loop_analysis.h
@@ -140,6 +140,23 @@ public:
    {
       hash_table_dtor(this->var_hash);
    }
+
+   static void* operator new(size_t size, void *ctx)
+   {
+      void *lvs = ralloc_size(ctx, size);
+      assert(lvs != NULL);
+
+      ralloc_set_destructor(lvs, (void (*)(void*)) destructor);
+
+      return lvs;
+   }
+
+private:
+   static void
+   destructor(loop_variable_state *lvs)
+   {
+      lvs->~loop_variable_state();
+   }
 };