#include "mono/utils/mono-compiler.h"
-extern long long stat_copy_object_called_nursery;
-extern long long stat_objects_copied_nursery;
+extern guint64 stat_copy_object_called_nursery;
+extern guint64 stat_objects_copied_nursery;
-extern long long stat_nursery_copy_object_failed_from_space;
-extern long long stat_nursery_copy_object_failed_forwarded;
-extern long long stat_nursery_copy_object_failed_pinned;
+extern guint64 stat_nursery_copy_object_failed_from_space;
+extern guint64 stat_nursery_copy_object_failed_forwarded;
+extern guint64 stat_nursery_copy_object_failed_pinned;
-extern long long stat_slots_allocated_in_vain;
+extern guint64 stat_slots_allocated_in_vain;
/*
+ * Copies an object and enqueues it if a queue is given.
+ *
* This function can be used even if the vtable of obj is not valid
* anymore, which is the case in the parallel collector.
*/
}
#endif
-#ifdef __GNUC__
- if (objsize <= sizeof (gpointer) * 8) {
- mword *dest = (mword*)destination;
- switch (objsize / sizeof (gpointer)) {
- case 8: (dest) [7] = ((mword*)obj) [7];
- case 7: (dest) [6] = ((mword*)obj) [6];
- case 6: (dest) [5] = ((mword*)obj) [5];
- case 5: (dest) [4] = ((mword*)obj) [4];
- case 4: (dest) [3] = ((mword*)obj) [3];
- case 3: (dest) [2] = ((mword*)obj) [2];
- case 2: (dest) [1] = ((mword*)obj) [1];
- }
- } else
-#endif
- {
- /*can't trust memcpy doing word copies */
- mono_gc_memmove_aligned (destination + sizeof (mword), (char*)obj + sizeof (mword), objsize - sizeof (mword));
- }
+ memcpy (destination + sizeof (mword), (char*)obj + sizeof (mword), objsize - sizeof (mword));
+
/* adjust array->bounds */
SGEN_ASSERT (9, vt->gc_descr, "vtable %p for class %s:%s has no gc descriptor", vt, vt->klass->name_space, vt->klass->name);
obj = destination;
if (queue) {
SGEN_LOG (9, "Enqueuing gray object %p (%s)", obj, sgen_safe_name (obj));
- GRAY_OBJECT_ENQUEUE (queue, obj);
+ GRAY_OBJECT_ENQUEUE (queue, obj, sgen_vtable_get_descriptor (vt));
}
}
MonoVTable *vt = ((MonoObject*)obj)->vtable;
gboolean has_references = SGEN_VTABLE_HAS_REFERENCES (vt);
mword objsize = SGEN_ALIGN_UP (sgen_par_object_get_size (vt, (MonoObject*)obj));
+ /* FIXME: Does this not mark the newly allocated object? */
char *destination = COLLECTOR_SERIAL_ALLOC_FOR_PROMOTION (vt, obj, objsize, has_references);
if (G_UNLIKELY (!destination)) {
+ /* FIXME: Is this path ever tested? */
collector_pin_object (obj, queue);
sgen_set_pinned_from_failed_allocation (objsize);
return obj;
}
- par_copy_object_no_checks (destination, vt, obj, objsize, has_references ? queue : NULL);
+ if (!has_references)
+ queue = NULL;
+
+ par_copy_object_no_checks (destination, vt, obj, objsize, queue);
/* FIXME: mark mod union cards if necessary */
/* set the forwarding pointer */