Imported Upstream version 5.0.0.100

Former-commit-id: b9c82b9a6f6d1841af7dcc458ddf5aefa1037f27
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-05-11 09:38:52 +00:00
parent 67a5eefa39
commit 9cc54951a2
16 changed files with 32 additions and 22 deletions

View File

@@ -240,7 +240,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
p = (void **)sgen_nursery_alloc (size);
}
if (!p)
return alloc_degraded (vtable, size, FALSE);
return alloc_degraded (vtable, size, TRUE);
zero_tlab_if_necessary (p, size);
} else {
@@ -257,7 +257,7 @@ sgen_alloc_obj_nolock (GCVTable vtable, size_t size)
p = (void **)sgen_nursery_alloc_range (tlab_size, size, &alloc_size);
}
if (!p)
return alloc_degraded (vtable, size, FALSE);
return alloc_degraded (vtable, size, TRUE);
/* Allocate a new TLAB from the current nursery fragment */
TLAB_START = (char*)p;