Author: zoltan
Date: 2007-12-20 16:47:35 -0500 (Thu, 20 Dec 2007)
New Revision: 91739

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/object.c
Log:
2007-12-20  Zoltan Varga  <[EMAIL PROTECTED]>

        * object.c (mono_class_compute_gc_descriptor): Remove unused 
GC_gcj_fast_malloc
        icall registration. Fixes #348193.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2007-12-20 20:42:53 UTC (rev 91738)
+++ trunk/mono/mono/metadata/ChangeLog  2007-12-20 21:47:35 UTC (rev 91739)
@@ -1,5 +1,8 @@
 2007-12-20  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * object.c (mono_class_compute_gc_descriptor): Remove unused 
GC_gcj_fast_malloc
+       icall registration. Fixes #348193.
+
        * marshal.c (mono_marshal_get_runtime_invoke): Put all runtime invoke 
wrappers
        for corlib classes into object. Fixes #349621.
 

Modified: trunk/mono/mono/metadata/object.c
===================================================================
--- trunk/mono/mono/metadata/object.c   2007-12-20 20:42:53 UTC (rev 91738)
+++ trunk/mono/mono/metadata/object.c   2007-12-20 21:47:35 UTC (rev 91739)
@@ -862,10 +862,16 @@
 
                GC_init_gcj_malloc (5, NULL);
 
+               /* 
+                * This is not needed unless the relevant code in 
mono_get_allocation_ftn () is 
+                * turned on.
+                */
+#if 0
 #ifdef GC_REDIRECT_TO_LOCAL
                mono_register_jit_icall (GC_local_gcj_malloc, 
"GC_local_gcj_malloc", mono_create_icall_signature ("object int ptr"), FALSE);
                mono_register_jit_icall (GC_local_gcj_fast_malloc, 
"GC_local_gcj_fast_malloc", mono_create_icall_signature ("object int ptr"), 
FALSE);
 #endif
+#endif
                mono_register_jit_icall (GC_gcj_malloc, "GC_gcj_malloc", 
mono_create_icall_signature ("object int ptr"), FALSE);
                mono_register_jit_icall (GC_gcj_fast_malloc, 
"GC_gcj_fast_malloc", mono_create_icall_signature ("object int ptr"), FALSE);
 #endif

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to