Imported Upstream version 4.2.2.30

Former-commit-id: 387a1af44e58248b9ada0beb315d12c52633d9e1
This commit is contained in:
Xamarin Public Jenkins 2016-01-21 17:38:10 -05:00
parent 3c6daee652
commit f302175246
22 changed files with 21 additions and 26 deletions

View File

@ -1 +1 @@
18d510880a46b3f8fcc62ee6d2743c2ad6ec142f f5ed7ffb57a89c75be4f5425ed6528e483d57c58

View File

@ -1 +1 @@
5ea7ca0de24029a348ac8342657aa95d53925e82 c616ade82d96a5ab15cd8b504e39483514b5241f

View File

@ -1 +1 @@
0637251b61def8d6dff27a5c3ab15f3e34de3e9d eb04980221098f6aa3334c22a67378b0ce957313

View File

@ -1 +1 @@
a90a1a94357eaac435b86ed064aa2078cc144b2e a26a40db174c277495cd693dd648bf93d31fe4b9

View File

@ -1 +1 @@
c9845643332357f61fb6a54a17f807991c5e7270 40b0f0738e2b385449a465b42d82765036b79bfa

View File

@ -1 +1 @@
1cc8b87d077544a9f323c682b733f0fa0d1a1567 6da2d6871aa2124113966387284988a7780338c7

View File

@ -1 +1 @@
d72025330154b3b52629a526c8cce5cbb390d58b 0e0947d4aadbc750a8cbde64d1bcf6890ee7fc21

View File

@ -1 +1 @@
e9d53d6ca1f39de0e8e00f24d0ad7a8bc0e72500 d9648374bf2a844012af4ca23c7e43c89f81a16e

View File

@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.2.2.29/efae6a0\"" > version.h echo "#define FULL_VERSION \"Stable 4.2.2.30/996df3c\"" > version.h
# Utility target for patching libtool to speed up linking # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

View File

@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
Makefile.am.in Makefile.am.in
version.h: Makefile version.h: Makefile
echo "#define FULL_VERSION \"Stable 4.2.2.29/efae6a0\"" > version.h echo "#define FULL_VERSION \"Stable 4.2.2.30/996df3c\"" > version.h
# Utility target for patching libtool to speed up linking # Utility target for patching libtool to speed up linking
patch-libtool: patch-libtool:

View File

@ -1 +1 @@
89ae0acc368fbb5f2e5c94a7279510c1abc670f2 aa98c3527a7389d3b5b9ebf236b36e0d2034d7d8

View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.2.2.29/efae6a0" #define FULL_VERSION "Stable 4.2.2.30/996df3c"

View File

@ -559,17 +559,14 @@ ms_alloc_block (int size_index, gboolean pinned, gboolean has_references)
add_free_block (free_blocks, size_index, info); add_free_block (free_blocks, size_index, info);
/* /*
* This is the only place where the `allocated_blocks` array can potentially grow. * Adding to the allocated_blocks array is racy with the removal of nulls when
* We need to make sure concurrent sweep isn't running when that happens, so in that * sweeping. We wait for sweep to finish to avoid that.
* specific case we just wait for sweep to finish.
* *
* The memory barrier here and in `sweep_job_func()` are required because we need * The memory barrier here and in `sweep_job_func()` are required because we need
* `allocated_blocks` synchronized between this and the sweep thread. * `allocated_blocks` synchronized between this and the sweep thread.
*/ */
if (sgen_pointer_queue_will_grow (&allocated_blocks)) { major_finish_sweep_checking ();
major_finish_sweep_checking (); mono_memory_barrier ();
mono_memory_barrier ();
}
sgen_pointer_queue_add (&allocated_blocks, BLOCK_TAG (info)); sgen_pointer_queue_add (&allocated_blocks, BLOCK_TAG (info));
@ -746,8 +743,6 @@ major_alloc_degraded (GCVTable vtable, size_t size)
{ {
GCObject *obj; GCObject *obj;
major_finish_sweep_checking ();
obj = alloc_obj (vtable, size, FALSE, SGEN_VTABLE_HAS_REFERENCES (vtable)); obj = alloc_obj (vtable, size, FALSE, SGEN_VTABLE_HAS_REFERENCES (vtable));
if (G_LIKELY (obj)) { if (G_LIKELY (obj)) {
HEAVY_STAT (++stat_objects_alloced_degraded); HEAVY_STAT (++stat_objects_alloced_degraded);

Binary file not shown.

View File

@ -1 +1 @@
6f3fb8a9d2b2b9e4b08119337dc9117d4bc61d04 64fe66bf682888601f3c233df80e30871f64d89c

Binary file not shown.

View File

@ -1 +1 @@
0acf885be28a53bab40f9d4e58120c3e4d15671b de1b80f9e770927dcebccb15eac235e77a106f70

Binary file not shown.

View File

@ -1 +1 @@
d283d42f090946cff3eaa02a0725e642ed1b51bf 1b2ba203449c5c1ec4689e5f3072d9026100fdb9

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 4.2.2\n" "Project-Id-Version: mono 4.2.2\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2016-01-18 20:20-0500\n" "POT-Creation-Date: 2016-01-21 16:05-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
8c9abe322c37a3e40246b2b53c20f760aec98126 9443b3c010889345ff24f9ac53f88d952d725080