2010-01-03 Zoltan Varga <vargaz@gmail.com>

	* mini-codegen.c abcremoval.c: Remove the duplicate g_slist_append_mempool
	functions which are now defined in mempool-internals.h.

svn path=/trunk/mono/; revision=148994

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 79ab0acb2911bad5e12707c30c874870f8965549..2b7b56d7cff2d6a18146435d57765cb1e6e5c674 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-03  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini-codegen.c abcremoval.c: Remove the duplicate g_slist_append_mempool
+       functions which are now defined in mempool-internals.h.
+
        * mini.c (mini_free_jit_domain_info): Free the seq point hash tables.
 
        * mini-llvm.c (mono_llvm_emit_method): Handle OP_ABS.

diff --git a/mono/mini/abcremoval.c b/mono/mini/abcremoval.c
index e7b14547a05c418ec44bc67091b4987e3a180499..2c0a29d255fdeeb10001e7d8f1ffafd8a94b10fb 100644 (file)
--- a/mono/mini/abcremoval.c
+++ b/mono/mini/abcremoval.c
@@ -12,6 +12,7 @@
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/mempool.h>
 #include <mono/metadata/opcodes.h>
+#include <mono/metadata/mempool-internals.h>
 
 #ifndef DISABLE_JIT
 
@@ -212,27 +213,6 @@ print_evaluation_area_contexts (MonoVariableRelationsEvaluationArea *area) {
 }
 #endif
 
-static inline GSList*
-g_slist_append_mempool (MonoMemPool *mp, GSList *list, gpointer data)
-{
-       GSList *new_list;
-       GSList *last;
-       
-       new_list = mono_mempool_alloc (mp, sizeof (GSList));
-       new_list->data = data;
-       new_list->next = NULL;
-       
-       if (list) {
-               last = list;
-               while (last->next)
-                       last = last->next;
-               last->next = new_list;
-               
-               return list;
-       } else
-               return new_list;
-}
-
 /*
  * Check if the delta of an integer variable value is safe with respect
  * to the variable size in bytes and its kind (signed or unsigned).

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index 2c1aced8bf1417b3e756664b48c66da8430d82df..4e29b1328d986ec11accd21434c85cb327e7f374 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -14,6 +14,7 @@
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/threads.h>
 #include <mono/metadata/profiler-private.h>
+#include <mono/metadata/mempool-internals.h>
 #include <mono/utils/mono-math.h>
 
 #include "mini.h"
@@ -112,27 +113,6 @@ static const int regbank_spill_var_size[] = {
 
 #define DEBUG(a) MINI_DEBUG(cfg->verbose_level, 3, a;)
 
-static inline GSList*
-g_slist_append_mempool (MonoMemPool *mp, GSList *list, gpointer data)
-{
-       GSList *new_list;
-       GSList *last;
-       
-       new_list = mono_mempool_alloc (mp, sizeof (GSList));
-       new_list->data = data;
-       new_list->next = NULL;
-       
-       if (list) {
-               last = list;
-               while (last->next)
-                       last = last->next;
-               last->next = new_list;
-               
-               return list;
-       } else
-               return new_list;
-}
-
 static inline void
 mono_regstate_assign (MonoRegState *rs)
 {