Merge pull request #2005 from BrzVlad/feature-concurrent-work

[mono.git] / mono / metadata / boehm-gc.c

diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
index 41b8590619669457482b38a1a6e32a77b8962f8a..12c0a762b9099ed31eb9e3d93e848ad3a648e017 100644 (file)
--- a/mono/metadata/boehm-gc.c
+++ b/mono/metadata/boehm-gc.c
@@ -217,6 +217,12 @@ mono_gc_base_init (void)
        gc_initialized = TRUE;
 }
 
+void
+mono_gc_base_cleanup (void)
+{
+       GC_finalizer_notifier = NULL;
+}
+
 /**
  * mono_gc_collect:
  * @generation: GC generation identifier
@@ -1056,6 +1062,8 @@ mono_gc_get_managed_allocator (MonoClass *klass, gboolean for_box, gboolean know
                return NULL;
        if (klass->byval_arg.type == MONO_TYPE_STRING) {
                atype = ATYPE_STRING;
+       } else if (!known_instance_size) {
+               return NULL;
        } else if (!klass->has_references) {
                if (for_box)
                        atype = ATYPE_FREEPTR_FOR_BOX;
@@ -1448,4 +1456,10 @@ mono_gc_register_finalizer_callbacks (MonoGCFinalizerCallbacks *callbacks)
        GC_set_finalizer_notify_proc ((void (*) (GC_PTR))fin_notifier);
 }
 
+gboolean
+mono_gc_is_null (void)
+{
+       return FALSE;
+}
+
 #endif /* no Boehm GC */