From 3711254460c743de6c473b69dc4a0863bed251fe Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 5 Mar 2019 08:28:53 +0000 Subject: [PATCH] Imported Upstream version 5.20.0.237 Former-commit-id: ad504501f4473c2a04a114df29a094eb6b9fbc5a --- 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/metadata/loader.c | 14 +++++++++++++- mono/metadata/mono-conc-hash.c | 2 ++ mono/metadata/object-internals.h | 2 +- mono/metadata/object.c.REMOVED.git-id | 2 +- mono/mini/ee.h | 4 ++-- mono/mini/interp-stubs.c | 2 +- mono/mini/interp/interp.c.REMOVED.git-id | 2 +- mono/mini/interp/transform.c.REMOVED.git-id | 2 +- mono/mini/intrinsics.c | 2 ++ mono/mini/mini-runtime.c.REMOVED.git-id | 2 +- mono/mini/mini.h.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/utils/mono-conc-hashtable.c | 7 ++++--- 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 +- 57 files changed, 68 insertions(+), 51 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 1139e89e75..1841319848 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e60587a6530024d1e09fa8b3fae2071a7baa49ca \ No newline at end of file +45307b705bed97a4a8b7045f329caf82bfd2cc90 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 6b4c27a1a5..20fc752f14 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -bd0e5dfd7cf736c2d10c084942f51b1f440c9dd4 \ No newline at end of file +1ee650edadac9ee5cea8593caad67248813737fa \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 026ffff4c8..4c135ca59e 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.20.0.232"; + public const string MonoVersion = "5.20.0.237"; 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/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index 7cf693b141..c73d6a7751 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -617daca15ea56d904ec2c8ad23b7e03bb209c7c7 \ No newline at end of file +01bfe8b94a6b2ae85868a40840ab2e392abd9431 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index caebf0f0a1..a6dee02a14 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -9eb8caad9a594ec47394891d0c93a703e7f3462a \ No newline at end of file +a391b9bf31dae30d2daea73afc84acbb687ee94b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 7338e55835..91099c327d 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e1aa28f449be20c90d6cfb72ca9817b9907c2f41 \ No newline at end of file +b334007a9154c5f0805bbb1890648819c403b7c3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 8224c815a8024421805f9be6c2717d077bb5287c..1e5b88a1589ee5b445e014163dc86be2ef9eaa49 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6x~hC?C_?*t4~V(S%2!XZ5GBaM6z*UH*%_0-Bec*?xhCF^i4aoIz{) Of?7tc?digdGYbHomKFa1 delta 58 zcmV-A0LA}+hz5X&29SsZHSsy|fsD0`0W=H{-?!1ejyjStable = new_table; hash_table->overflow_count = (int)(new_table->table_size * LOAD_FACTOR); + hash_table->element_count -= hash_table->tombstone_count; + hash_table->tombstone_count = 0; conc_table_lf_free (old_table); } diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h index 6fe94fb681..5080eaebf2 100644 --- a/mono/metadata/object-internals.h +++ b/mono/metadata/object-internals.h @@ -682,7 +682,7 @@ typedef struct { void (*set_cast_details) (MonoClass *from, MonoClass *to); void (*debug_log) (int level, MonoStringHandle category, MonoStringHandle message); gboolean (*debug_log_is_enabled) (void); - void (*init_delegate) (MonoDelegate *del); + void (*init_delegate) (MonoDelegate *del, MonoError *error); MonoObject* (*runtime_invoke) (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error); void* (*compile_method) (MonoMethod *method, MonoError *error); gpointer (*create_jump_trampoline) (MonoDomain *domain, MonoMethod *method, gboolean add_sync_wrapper, MonoError *error); diff --git a/mono/metadata/object.c.REMOVED.git-id b/mono/metadata/object.c.REMOVED.git-id index 1a80c494ba..d2d0c56cc5 100644 --- a/mono/metadata/object.c.REMOVED.git-id +++ b/mono/metadata/object.c.REMOVED.git-id @@ -1 +1 @@ -2b5e48f6b5e4004a85e795fdd0ab63d28067d42b \ No newline at end of file +02cc9844598f164f41eacd362abd81a74ebfca78 \ No newline at end of file diff --git a/mono/mini/ee.h b/mono/mini/ee.h index 57e87d2f8a..607b2ba659 100644 --- a/mono/mini/ee.h +++ b/mono/mini/ee.h @@ -15,7 +15,7 @@ #ifndef __MONO_EE_H__ #define __MONO_EE_H__ -#define MONO_EE_API_VERSION 0x60010 +#define MONO_EE_API_VERSION 0x60011 typedef struct _MonoInterpStackIter MonoInterpStackIter; @@ -31,7 +31,7 @@ struct _MonoEECallbacks { void (*to_native_trampoline) (gpointer addr, gpointer ccontext); gpointer (*create_method_pointer) (MonoMethod *method, gboolean compile, MonoError *error); MonoObject* (*runtime_invoke) (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error); - void (*init_delegate) (MonoDelegate *del); + void (*init_delegate) (MonoDelegate *del, MonoError *error); void (*delegate_ctor) (MonoObjectHandle this_obj, MonoObjectHandle target, gpointer addr, MonoError *error); gpointer (*get_remoting_invoke) (gpointer imethod, MonoError *error); void (*set_resume_state) (MonoJitTlsData *jit_tls, MonoException *ex, MonoJitExceptionInfo *ei, MonoInterpFrameHandle interp_frame, gpointer handler_ip); diff --git a/mono/mini/interp-stubs.c b/mono/mini/interp-stubs.c index 83aa8520d6..c381cfc008 100644 --- a/mono/mini/interp-stubs.c +++ b/mono/mini/interp-stubs.c @@ -121,7 +121,7 @@ stub_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject ** } static void -stub_init_delegate (MonoDelegate *del) +stub_init_delegate (MonoDelegate *del, MonoError *error) { g_assert_not_reached (); } diff --git a/mono/mini/interp/interp.c.REMOVED.git-id b/mono/mini/interp/interp.c.REMOVED.git-id index d035e31e2f..d431f01faf 100644 --- a/mono/mini/interp/interp.c.REMOVED.git-id +++ b/mono/mini/interp/interp.c.REMOVED.git-id @@ -1 +1 @@ -a3f36e4c8dd3d07809567960ad2afa58934260eb \ No newline at end of file +f708ef5d1ff991c7f508e12409f2ad4b9b18c1cc \ No newline at end of file diff --git a/mono/mini/interp/transform.c.REMOVED.git-id b/mono/mini/interp/transform.c.REMOVED.git-id index a466ea1990..4aa4916a8c 100644 --- a/mono/mini/interp/transform.c.REMOVED.git-id +++ b/mono/mini/interp/transform.c.REMOVED.git-id @@ -1 +1 @@ -4f5461a7a3713b4e2199f95f0586196b0512f72d \ No newline at end of file +73c852006087d6db84f887814754c4593eb8cf83 \ No newline at end of file diff --git a/mono/mini/intrinsics.c b/mono/mini/intrinsics.c index 48cb57a6c8..b48d151d16 100644 --- a/mono/mini/intrinsics.c +++ b/mono/mini/intrinsics.c @@ -1173,6 +1173,8 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign !strcmp (cmethod_klass_name_space, "XamCore.ObjCRuntime") && !strcmp (cmethod_klass_name, "Selector")) || ((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") || + !strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.WatchOS") || + !strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.TVOS") || !strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac")) && !strcmp (cmethod_klass_name_space, "ObjCRuntime") && !strcmp (cmethod_klass_name, "Selector")) diff --git a/mono/mini/mini-runtime.c.REMOVED.git-id b/mono/mini/mini-runtime.c.REMOVED.git-id index 5c3fe490c7..c3371aefba 100644 --- a/mono/mini/mini-runtime.c.REMOVED.git-id +++ b/mono/mini/mini-runtime.c.REMOVED.git-id @@ -1 +1 @@ -b4e48873ea9699ddedb859bf10b9ff0a47d61a45 \ No newline at end of file +3cc151ea061d7a33f92117c62a2f4940f433e9ee \ No newline at end of file diff --git a/mono/mini/mini.h.REMOVED.git-id b/mono/mini/mini.h.REMOVED.git-id index 1dd837f5d6..ddb131391d 100644 --- a/mono/mini/mini.h.REMOVED.git-id +++ b/mono/mini/mini.h.REMOVED.git-id @@ -1 +1 @@ -438aa6d7b5a20ce512ecb31cd610e36c5beadbc5 \ No newline at end of file +b7ce24d3949d4ae2739d92cdf7156e46c67b3450 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index f316793733..bc18981314 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/74cfbd2" +#define FULL_VERSION "explicit/78e155f" diff --git a/mono/utils/mono-conc-hashtable.c b/mono/utils/mono-conc-hashtable.c index 6d6012453c..c7050a2a5a 100644 --- a/mono/utils/mono-conc-hashtable.c +++ b/mono/utils/mono-conc-hashtable.c @@ -129,6 +129,8 @@ rehash_table (MonoConcurrentHashTable *hash_table, int multiplier) mono_memory_barrier (); hash_table->table = new_table; hash_table->overflow_count = (int)(new_table->table_size * LOAD_FACTOR); + hash_table->element_count -= hash_table->tombstone_count; + hash_table->tombstone_count = 0; conc_table_lf_free (old_table); } @@ -351,12 +353,11 @@ mono_conc_hashtable_insert (MonoConcurrentHashTable *hash_table, gpointer key, g kvs [i].value = value; /* The write to values must happen after the write to keys */ mono_memory_barrier (); - kvs [i].key = key; if (kvs [i].key == TOMBSTONE) --hash_table->tombstone_count; else ++hash_table->element_count; - + kvs [i].key = key; return NULL; } if (key == kvs [i].key) { @@ -372,11 +373,11 @@ mono_conc_hashtable_insert (MonoConcurrentHashTable *hash_table, gpointer key, g kvs [i].value = value; /* The write to values must happen after the write to keys */ mono_memory_barrier (); - kvs [i].key = key; if (kvs [i].key == TOMBSTONE) --hash_table->tombstone_count; else ++hash_table->element_count; + kvs [i].key = key; return NULL; } if (equal (key, kvs [i].key)) { diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index e15ad90517482a90cae525a4abe7a8c9b5feba51..bcba53ef9d42f76ed660449101e39ec993e7128d 100644 GIT binary patch delta 14 VcmbQIHBW29Q!Yl+&Cj?jxBx6W1xo+` delta 14 VcmbQIHBW29Q!YlM&Cj?jxBx6E1xNq@ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index e01059345f..becab8ec56 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -91f136d1cda98ed73e69a452ab6d9c23a81603d5 \ No newline at end of file +6b614d5a360c59edb60a86a90cb6a9a53777a3f5 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 814bafabf9ee094e36b7e50cfc4ac5ef7215ed42..f8acb18860a3c3a905ebc80237787834ff823d14 100644 GIT binary patch delta 14 VcmX?Ef3kjqo+6{^W_`t3asV+K1%Utn delta 14 VcmX?Ef3kjqo+6{sW_`t3asV+21%3bk diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 4500a2017e..7ff7e521cb 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -4ca9efc3c22d5f88173dd6f36d47a33bc7e99e87 \ No newline at end of file +841d13511c689e73843458f3c12f7de1803ee1d1 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 52cf4a5c891972b8934252665aeca93de2051c41..a2654076ad8a0eb7b5860c3b093445c7bedb2673 100644 GIT binary patch delta 16 Xcmeyri1Gg-#tj_mjHa78)yuR1JoN?L delta 16 Xcmeyri1Gg-#tj_mj7FO|)yuR1JmUr0 diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index b29d8e97f0..bebf119b73 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -b342a4bc3b6f812d720ca53bb897d70826b13773 \ No newline at end of file +53bc05053515abf582bb864aa45dcb2bcb6759d3 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index b1031f9aae..14c9710d47 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.20.0.232\n" +"Project-Id-Version: mono 5.20.0.237\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-03-02 08:07+0000\n" +"POT-Creation-Date: 2019-03-05 08:07+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 37535a537205a3f82ddfbb05979bdd638c75df9b..99100de87ca39b73dec5168c08356d7639d608da 100644 GIT binary patch delta 16 YcmaF1gXP%{mJM-J8BI6GPi1ch07X;>Qvd(} delta 16 YcmaF1gXP%{mJM-J8I3l_Pi1ch07XIvPyhe` diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 149752d6c7..d948242c86 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -a850b58626adeb85a98ae7bf2e1f13442701b800 \ No newline at end of file +c16fa2a8e0e8d0ef9e740328e6bf493dfd1d3bd0 \ No newline at end of file