X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Fir_function_detect_recursion.cpp;h=b2334d2e403316a3cb0c6c820bb012abfc31160b;hb=153b8b35257fb5d68735b5e43e48b0cdb8b15170;hp=0a5e647cd8875c159abc7ff9e6487f1d50b1720a;hpb=82065fa20ee3f2880a070f1f4f75509b910cedde;p=mesa.git

diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/glsl/ir_function_detect_recursion.cpp
index 0a5e647cd88..b2334d2e403 100644
--- a/src/glsl/ir_function_detect_recursion.cpp
+++ b/src/glsl/ir_function_detect_recursion.cpp
@@ -127,6 +127,8 @@
 #include "program/hash_table.h"
 #include "program.h"
 
+namespace {
+
 struct call_node : public exec_node {
    class function *func;
 };
@@ -139,25 +141,7 @@ public:
       /* empty */
    }
 
-
-   /* Callers of this ralloc-based new need not call delete. It's
-    * easier to just ralloc_free 'ctx' (or any of its ancestors). */
-   static void* operator new(size_t size, void *ctx)
-   {
-      void *node;
-
-      node = ralloc_size(ctx, size);
-      assert(node != NULL);
-
-      return node;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just
-    * ralloc_free in that case. */
-   static void operator delete(void *node)
-   {
-      ralloc_free(node);
-   }
+   DECLARE_RALLOC_CXX_OPERATORS(function)
 
    ir_function_signature *sig;
 
@@ -173,6 +157,7 @@ public:
    has_recursion_visitor()
       : current(NULL)
    {
+      progress = false;
       this->mem_ctx = ralloc_context(NULL);
       this->function_hash = hash_table_ctor(0, hash_table_pointer_hash,
 					    hash_table_pointer_compare);
@@ -239,18 +224,18 @@ public:
    bool progress;
 };
 
+} /* anonymous namespace */
+
 static void
 destroy_links(exec_list *list, function *f)
 {
-   foreach_list_safe(node, list) {
-      struct call_node *n = (struct call_node *) node;
-
+   foreach_in_list_safe(call_node, node, list) {
       /* If this is the right function, remove it.  Note that the loop cannot
        * terminate now.  There can be multiple links to a function if it is
        * either called multiple times or calls multiple times.
        */
-      if (n->func == f)
-	 n->remove();
+      if (node->func == f)
+	 node->remove();
    }
 }
 
@@ -297,7 +282,7 @@ emit_errors_unlinked(const void *key, void *data, void *closure)
 
    memset(&loc, 0, sizeof(loc));
    _mesa_glsl_error(&loc, state,
-		    "function `%s' has static recursion.",
+		    "function `%s' has static recursion",
 		    proto);
    ralloc_free(proto);
 }
@@ -318,7 +303,6 @@ emit_errors_linked(const void *key, void *data, void *closure)
 
    linker_error(prog, "function `%s' has static recursion.\n", proto);
    ralloc_free(proto);
-   prog->LinkStatus = false;
 }