From 54da658bb0003ba2627f8db13a1147ed6edfaa92 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 15 Jun 2019 08:36:41 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.302 Former-commit-id: 6ce52ddc0b7baac4a7336297640588094dac2b80 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 +- mono/utils/mono-lazy-init.h | 48 ++++++++++++++++-- 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 | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 47 files changed, 85 insertions(+), 43 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index fc6e85978a..ff1dfa5153 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -32032351f05623ddf476bdcb57a30b529b3d2e8d \ No newline at end of file +31a9498daf6bb155f2123b3ecd7faa579ade4c98 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 7d58b67ea2..0b54d12933 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -19a2e7c59e1e46b86ca76d5200cbc4328a92171a \ No newline at end of file +e17288b2e852e32474aebf862e6347b06e6cd2a2 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 474d6dd772..39bb380bf1 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.0.0.300"; + public const string MonoVersion = "6.0.0.302"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 95e187949a..8c46b9d160 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -610f149d02b43843d60ea943b1dbda131da50857 \ No newline at end of file +707e0df8d36d7e873f6a93d82ff286a0e675825a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index bf570c56f7..4893544c76 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -ac5a904a97698ca709eefcd4adf1163eb0018487 \ No newline at end of file +e0cfa451b476ede754a8d5bb0ecaf177b2506b98 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index f7b7016699..6720037e6c 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -ef3898ec0a1a2fb4899d555333cf761c9d5ec07e \ No newline at end of file +a8e0dec34755f207498bca98116670d810e34bd7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index f44a314bccf123d8b216d6f4b9e833544079f2cc..687c305391eb6acb2afd2605895253b0bfb834b5 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZAyj{zfsD0`0W1st<8 delta 58 zcmV-A0LA}+hz5X&29SsZ&%OS?fsD0`0W1st<8 delta 58 zcmV-A0LA}+hz5X&29SsZ&%OS?fsD0`0W1st<8 delta 58 zcmV-A0LA}+hz5X&29SsZ&%OS?fsD0`0W1st<8 delta 58 zcmV-A0LA}+hz5X&29SsZ&%OS?fsD0`0W1s= MONO_LAZY_INIT_STATUS_INITIALIZED) return status == MONO_LAZY_INIT_STATUS_INITIALIZED; + if (status == MONO_LAZY_INIT_STATUS_INITIALIZING || mono_atomic_cas_i32 (lazy_init, MONO_LAZY_INIT_STATUS_INITIALIZING, MONO_LAZY_INIT_STATUS_NOT_INITIALIZED) != MONO_LAZY_INIT_STATUS_NOT_INITIALIZED ) { while (*lazy_init == MONO_LAZY_INIT_STATUS_INITIALIZING) - mono_thread_info_yield (); + mono_thread_info_yield (); // FIXME: This is not coop-friendly. + g_assert (mono_atomic_load_i32 (lazy_init) >= MONO_LAZY_INIT_STATUS_INITIALIZED); - return status == MONO_LAZY_INIT_STATUS_INITIALIZED; + + // This result is transient. Another thread can proceed to cleanup. + // Perhaps cleanup should not be attempted, just on-demand initialization. + return *lazy_init == MONO_LAZY_INIT_STATUS_INITIALIZED; } initialize (); mono_atomic_store_release (lazy_init, MONO_LAZY_INIT_STATUS_INITIALIZED); + + // This result is transient. Another thread can proceed to cleanup. + // Perhaps cleanup should not be attempted, just on-demand initialization. return TRUE; } diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 68e0abe1311177ec06ace8f6d28594a00c4df91e..53bccd187cefb0f0401369103a1579e8caed7840 100644 GIT binary patch delta 14 VcmbQIHBW29Q!Yl+&Cj?jxBx6W1xo+` delta 14 VcmbQIHBW29Q!Yl6&Cj?jxBx6Q1xf$_ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index e3b63ddee0..1d8afc77f1 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -35858a58c9cca01515d5e56d8c2bdd27b11e3d0e \ No newline at end of file +677dc9591de53fcfdbd708940b441191503b3496 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index d3754b1374ac62f22373044445d217f47e992ec9..19ebfa8b6f5999ac03a2ce56f9f89b43540f6b4f 100644 GIT binary patch delta 14 VcmX?Ef3kjqo+6{^W_`t3asV+K1%Utn delta 14 VcmX?Ef3kjqo+6{kW_`t3asV+E1%Lnm diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 6b0e1fa234..0bcabf0763 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -8247971707c68040471dabc7b3b9fc2dc05fcdb8 \ No newline at end of file +907ea4e25da95b086f1327c2357ee1e995071bd4 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index b77cc87bb63d353121d3272c5676a884591663d6..f43a20057cd89d16e5dc1c919f985f0d93eb91c2 100644 GIT binary patch delta 16 Xcmeyri1Gg-#tj_mjHa78)yuR1JoN?L delta 16 Xcmeyri1Gg-#tj_mj3%2o)yuR1JnseE diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index c283978c18..9f08e1356a 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -c3eea70da1a0c2a30b11f370b77d988850744f0c \ No newline at end of file +5dc06f534ea570b212a34a0f3d4138248208e5dd \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index d791a8f1aa..1452c7ed9f 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.300\n" +"Project-Id-Version: mono 6.0.0.302\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-06-14 08:08+0000\n" +"POT-Creation-Date: 2019-06-15 08:08+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 1fa12baf728d7db9443d131455dd177ca61b3430..59ca1cda9a33b307fdc309c410c9b33b1c6dccfd 100644 GIT binary patch delta 16 YcmaF1gXP%{mJM-J8BI6GPi1ch07X;>Qvd(} delta 16 YcmaF1gXP%{mJM-J8BI3FPi1ch07Xs*QUCw| diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 7e49807501..9933f32364 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -d9eee91f60bd1f5c08357637bb98da1529bb8bff \ No newline at end of file +7c8080c91e032fa76e5f088eadb2df4d784b29fe \ No newline at end of file