Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[runtime] Remove compile time gc dependencies from object.c. #5266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vargaz merged 1 commit into from
Jul 26, 2017
Merged

[runtime] Remove compile time gc dependencies from object.c. #5266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 48 additions & 51 deletions mono/metadata/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,14 +742,12 @@ compute_class_bitmap (MonoClass *klass, gsize *bitmap, int size, int offset, int
size = max_size;
}

#ifdef HAVE_SGEN_GC
/*An Ephemeron cannot be marked by sgen*/
if (!static_fields && klass->image == mono_defaults.corlib && !strcmp ("Ephemeron", klass->name)) {
/* An Ephemeron cannot be marked by sgen */
if (mono_gc_is_moving () && !static_fields && klass->image == mono_defaults.corlib && !strcmp ("Ephemeron", klass->name)) {
*max_set = 0;
memset (bitmap, 0, size / 8);
return bitmap;
}
#endif

for (p = klass; p != NULL; p = p->parent) {
gpointer iter = NULL;
Expand Down Expand Up @@ -1932,23 +1930,22 @@ mono_class_create_runtime_vtable (MonoDomain *domain, MonoClass *klass, MonoErro
vt->domain = domain;

mono_class_compute_gc_descriptor (klass);
/*
* We can't use typed allocation in the non-root domains, since the
* collector needs the GC descriptor stored in the vtable even after
* the mempool containing the vtable is destroyed when the domain is
* unloaded. An alternative might be to allocate vtables in the GC
* heap, but this does not seem to work (it leads to crashes inside
* libgc). If that approach is tried, two gc descriptors need to be
* allocated for each class: one for the root domain, and one for all
* other domains. The second descriptor should contain a bit for the
* vtable field in MonoObject, since we can no longer assume the
* vtable is reachable by other roots after the appdomain is unloaded.
*/
#ifdef HAVE_BOEHM_GC
if (domain != mono_get_root_domain () && !mono_dont_free_domains)
/*
* For Boehm:
* We can't use typed allocation in the non-root domains, since the
* collector needs the GC descriptor stored in the vtable even after
* the mempool containing the vtable is destroyed when the domain is
* unloaded. An alternative might be to allocate vtables in the GC
* heap, but this does not seem to work (it leads to crashes inside
* libgc). If that approach is tried, two gc descriptors need to be
* allocated for each class: one for the root domain, and one for all
* other domains. The second descriptor should contain a bit for the
* vtable field in MonoObject, since we can no longer assume the
* vtable is reachable by other roots after the appdomain is unloaded.
*/
if (!mono_gc_is_moving () && domain != mono_get_root_domain () && !mono_dont_free_domains)
Copy link
Contributor

@joncham joncham Jul 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably fine, but this really has nothing to do with moving GC. Just GC that needs object descriptors valid after domain unload.

I see we are just using mono_gc_is_moving as proxy for SGen so maybe that's okay.

vt->gc_descr = MONO_GC_DESCRIPTOR_NULL;
else
#endif
vt->gc_descr = klass->gc_descr;

gc_bits = mono_gc_get_vtable_bits (klass);
Expand Down Expand Up @@ -5620,18 +5617,18 @@ mono_array_full_copy (MonoArray *src, MonoArray *dest)
static void
array_full_copy_unchecked_size (MonoArray *src, MonoArray *dest, MonoClass *klass, uintptr_t size)
{
#ifdef HAVE_SGEN_GC
if (klass->element_class->valuetype) {
if (klass->element_class->has_references)
mono_value_copy_array (dest, 0, mono_array_addr_with_size_fast (src, 0, 0), mono_array_length (src));
else
mono_gc_memmove_atomic (&dest->vector, &src->vector, size);
if (mono_gc_is_moving ()) {
if (klass->element_class->valuetype) {
if (klass->element_class->has_references)
mono_value_copy_array (dest, 0, mono_array_addr_with_size_fast (src, 0, 0), mono_array_length (src));
else
mono_gc_memmove_atomic (&dest->vector, &src->vector, size);
} else {
mono_array_memcpy_refs (dest, 0, src, 0, mono_array_length (src));
}
} else {
mono_array_memcpy_refs (dest, 0, src, 0, mono_array_length (src));
mono_gc_memmove_atomic (&dest->vector, &src->vector, size);
}
#else
mono_gc_memmove_atomic (&dest->vector, &src->vector, size);
#endif
}

/**
Expand Down Expand Up @@ -6361,31 +6358,31 @@ mono_value_box_checked (MonoDomain *domain, MonoClass *klass, gpointer value, Mo

size = size - sizeof (MonoObject);

#ifdef HAVE_SGEN_GC
g_assert (size == mono_class_value_size (klass, NULL));
mono_gc_wbarrier_value_copy ((char *)res + sizeof (MonoObject), value, 1, klass);
#else
if (mono_gc_is_moving ()) {
g_assert (size == mono_class_value_size (klass, NULL));
mono_gc_wbarrier_value_copy ((char *)res + sizeof (MonoObject), value, 1, klass);
Copy link
Contributor

@joncham joncham Jul 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason we can't just use mono_gc_wbarrier_value_copy for all cases here?

} else {
#if NO_UNALIGNED_ACCESS
mono_gc_memmove_atomic ((char *)res + sizeof (MonoObject), value, size);
#else
switch (size) {
case 1:
*((guint8 *) res + sizeof (MonoObject)) = *(guint8 *) value;
break;
case 2:
*(guint16 *)((guint8 *) res + sizeof (MonoObject)) = *(guint16 *) value;
break;
case 4:
*(guint32 *)((guint8 *) res + sizeof (MonoObject)) = *(guint32 *) value;
break;
case 8:
*(guint64 *)((guint8 *) res + sizeof (MonoObject)) = *(guint64 *) value;
break;
default:
mono_gc_memmove_atomic ((char *)res + sizeof (MonoObject), value, size);
}
#endif
#else
switch (size) {
case 1:
*((guint8 *) res + sizeof (MonoObject)) = *(guint8 *) value;
break;
case 2:
*(guint16 *)((guint8 *) res + sizeof (MonoObject)) = *(guint16 *) value;
break;
case 4:
*(guint32 *)((guint8 *) res + sizeof (MonoObject)) = *(guint32 *) value;
break;
case 8:
*(guint64 *)((guint8 *) res + sizeof (MonoObject)) = *(guint64 *) value;
break;
default:
mono_gc_memmove_atomic ((char *)res + sizeof (MonoObject), value, size);
}
#endif
}
if (klass->has_finalize) {
mono_object_register_finalizer (res);
return_val_if_nok (error, NULL);
Expand Down