Imported Upstream version 4.2.0.207

Former-commit-id: f90f74cb984aa12eac8e2a357db43169ae7378e5
This commit is contained in:
Xamarin Public Jenkins
2015-09-02 12:36:57 -04:00
committed by Jo Shields
parent 6992685b86
commit afe402035c
53 changed files with 992 additions and 170 deletions

View File

@@ -1 +1 @@
a24badfaf7c185d8a870932a9ed92ad26f23face
21fd9dab9e70d3456026645e195f183d4ffb2739

View File

@@ -739,7 +739,11 @@ free_pinned_object (GCObject *obj, size_t size)
static GCObject*
major_alloc_degraded (GCVTable vtable, size_t size)
{
GCObject *obj = alloc_obj (vtable, size, FALSE, SGEN_VTABLE_HAS_REFERENCES (vtable));
GCObject *obj;
major_finish_sweep_checking ();
obj = alloc_obj (vtable, size, FALSE, SGEN_VTABLE_HAS_REFERENCES (vtable));
if (G_LIKELY (obj)) {
HEAVY_STAT (++stat_objects_alloced_degraded);
HEAVY_STAT (stat_bytes_alloced_degraded += size);