From f302175246eed7559967944205f20c4f58a11331 Mon Sep 17 00:00:00 2001 From: Xamarin Public Jenkins Date: Thu, 21 Jan 2016 17:38:10 -0500 Subject: [PATCH] Imported Upstream version 4.2.2.30 Former-commit-id: 387a1af44e58248b9ada0beb315d12c52633d9e1 --- .../monolite/Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../monolite/System.Core.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../monolite/System.Xml.dll.REMOVED.git-id | 2 +- .../lib/monolite/System.dll.REMOVED.git-id | 2 +- .../lib/monolite/basic.exe.REMOVED.git-id | 2 +- .../lib/monolite/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/sgen/sgen-marksweep.c | 13 ++++--------- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 2 +- po/mcs/pt_BR.gmo | Bin 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 22 files changed, 21 insertions(+), 26 deletions(-) diff --git a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id index 93513cf9a0..77c9b73997 100644 --- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -18d510880a46b3f8fcc62ee6d2743c2ad6ec142f \ No newline at end of file +f5ed7ffb57a89c75be4f5425ed6528e483d57c58 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id index f150cb1ee0..2e274d4b68 100644 --- a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -5ea7ca0de24029a348ac8342657aa95d53925e82 \ No newline at end of file +c616ade82d96a5ab15cd8b504e39483514b5241f \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id index 79ae054bb5..62dd46cbc0 100644 --- a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -0637251b61def8d6dff27a5c3ab15f3e34de3e9d \ No newline at end of file +eb04980221098f6aa3334c22a67378b0ce957313 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id index 81e1875ca2..b779ac7233 100644 --- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -a90a1a94357eaac435b86ed064aa2078cc144b2e \ No newline at end of file +a26a40db174c277495cd693dd648bf93d31fe4b9 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id index a5859e1494..9b4c2f5683 100644 --- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c9845643332357f61fb6a54a17f807991c5e7270 \ No newline at end of file +40b0f0738e2b385449a465b42d82765036b79bfa \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index f8f4d98e9a..b5a0aca67a 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -1cc8b87d077544a9f323c682b733f0fa0d1a1567 \ No newline at end of file +6da2d6871aa2124113966387284988a7780338c7 \ No newline at end of file diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index 6c66137f73..3a0aa8e06d 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -d72025330154b3b52629a526c8cce5cbb390d58b \ No newline at end of file +0e0947d4aadbc750a8cbde64d1bcf6890ee7fc21 \ No newline at end of file diff --git a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id index 712e9c1e5c..a6a2acdd1c 100644 --- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e9d53d6ca1f39de0e8e00f24d0ad7a8bc0e72500 \ No newline at end of file +d9648374bf2a844012af4ca23c7e43c89f81a16e \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 484aabed4f..f2e5ac94f0 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in 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 patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 484aabed4f..f2e5ac94f0 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in 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 patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index f19ba86973..9cc31de1d3 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -89ae0acc368fbb5f2e5c94a7279510c1abc670f2 \ No newline at end of file +aa98c3527a7389d3b5b9ebf236b36e0d2034d7d8 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 2dd8e05c51..a0b6200313 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.2.2.29/efae6a0" +#define FULL_VERSION "Stable 4.2.2.30/996df3c" diff --git a/mono/sgen/sgen-marksweep.c b/mono/sgen/sgen-marksweep.c index 0cd42f7a79..55f40aba76 100644 --- a/mono/sgen/sgen-marksweep.c +++ b/mono/sgen/sgen-marksweep.c @@ -559,17 +559,14 @@ ms_alloc_block (int size_index, gboolean pinned, gboolean has_references) add_free_block (free_blocks, size_index, info); /* - * This is the only place where the `allocated_blocks` array can potentially grow. - * We need to make sure concurrent sweep isn't running when that happens, so in that - * specific case we just wait for sweep to finish. + * Adding to the allocated_blocks array is racy with the removal of nulls when + * sweeping. We wait for sweep to finish to avoid that. * * The memory barrier here and in `sweep_job_func()` are required because we need * `allocated_blocks` synchronized between this and the sweep thread. */ - if (sgen_pointer_queue_will_grow (&allocated_blocks)) { - major_finish_sweep_checking (); - mono_memory_barrier (); - } + major_finish_sweep_checking (); + mono_memory_barrier (); sgen_pointer_queue_add (&allocated_blocks, BLOCK_TAG (info)); @@ -746,8 +743,6 @@ major_alloc_degraded (GCVTable vtable, size_t size) { 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); diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 9c424c3930aaba39a430656eca4de50f4d348186..90646289724f0f4628e7c6285558f6e9ee7eaf89 100644 GIT binary patch delta 21 ccmbQIHBW296D|%TLj^-KD+ANbZ@7%O08kbNr2qf` delta 21 ccmbQIHBW296D|%z3k4$sD\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 51c74eee7ae78f818657ed4a4d865f4c552ad63b..2c171f21060ca2e01a5571e46e706becb02bdbce 100644 GIT binary patch delta 23 fcmX@Po8{zgmJO2AIE)Mx49%