From c3eb216a61003ee5c29e88347740814ea377d70a Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 12 Sep 2018 08:26:22 +0000 Subject: [PATCH] Imported Upstream version 5.16.0.153 Former-commit-id: 7cba6d39742966cd5782f597f098ad52fdb8e44a --- 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 +- .../1051600011/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600011/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600011/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600011/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../1051600011/System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051600011/System.Xml.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/aot-tests.cs | 32 ++++++++++++++---- mono/mini/mini-arm64.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- 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 +- 39 files changed, 58 insertions(+), 38 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 9ef6474e9d..b3c7ce3808 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -51364561320852469bd836103f71db882397229a \ No newline at end of file +ec975717bb2bf08321e56bfdbaa962ae816838cd \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 05b9b9275b..2793f5b5a1 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -35ad5674b39fdc30feaef8742befc5a9769b06f8 \ No newline at end of file +6153ea9478aade84d4dbba36e08b8d1434b7edbf \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 0ff3720ee4..ffa85e7393 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.16.0.152"; + public const string MonoVersion = "5.16.0.153"; 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-darwin/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id index 194b3dad18..927ef166ad 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f214e3a3a558c2cde963ef2ec939f271d60f3ade \ No newline at end of file +ca0cd06fcd26e50656ecdedeffff90771ed9aafa \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id index 46460db7a3..5dbe36f563 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -e9ca90c4a6cdb23f8f9351a8cc705833b1347a84 \ No newline at end of file +065b1855fb2e652132a9f5cf3579d17eb402a95a \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll index c179ed5bc090f006c581572e9421c6c55742279b..e53b6efdc4b03545f9237bff9129942bd9cf3837 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6y0+Q>*>Hv1e-!qY00I@=KK%hFT8y?YG$u-surA-hP3HF^i4am_cj$ Of?7tc?digdGYbH11Qb;O delta 58 zcmV-A0LA}+hz5X&29SsZm6-*>Hv1e-!qY00I@=KK%hFT8y?YG$u-surA-hP3HF^i4am_cj$ Of?7tc?digdGYbH11Qb;O delta 58 zcmV-A0LA}+hz5X&29SsZm6-*>Hv1e-!qY00I@=KK%hFT8y?YG$u-surA-hP3HF^i4am_cj$ Of?7tc?digdGYbH11Qb;O delta 58 zcmV-A0LA}+hz5X&29SsZm6- GetNull() where T : struct { return null; } + + [MethodImplAttribute (MethodImplOptions.NoInlining)] + public static bool GetHasValueManyArgs(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, T? value) where T : struct + { + return value.HasValue; + } } [Category ("DYNCALL")] @@ -300,6 +306,24 @@ class Tests return 0; } + [Category ("DYNCALL")] + [Category ("!WASM")] //Interp fails + public static int test_0_arm64_dyncall_vtypebyrefonstack () { + var s = new LargeStruct () { a = 1, b = 2, c = 3, d = 4 }; + + NullableMethods.GetHasValueManyArgs (1, 2, 3, 4, 5, 6, 7, 8, s); + + Type type = typeof (LargeStruct?).GetGenericArguments () [0]; + var m = typeof(NullableMethods).GetMethod("GetHasValueManyArgs", BindingFlags.Static | BindingFlags.Public); + bool b1 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { 1, 2, 3, 4, 5, 6, 7, 8, s }); + if (!b1) + return 1; + bool b2 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { 1, 2, 3, 4, 5, 6, 7, 8, null }); + if (b2) + return 2; + return 0; + } + enum AnEnum { A = 0, B = 1 @@ -425,13 +449,9 @@ class Tests public static int test_0_large_nullable_invoke () { var s = new LargeStruct () { a = 1, b = 2, c = 3, d = 4 }; - GetHasValue (s); + NullableMethods.GetHasValue (s); -#if __MOBILE__ - var m = typeof(AotTests).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public); -#else - var m = typeof(Tests).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public); -#endif + var m = typeof(NullableMethods).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public); Type type = typeof (LargeStruct?).GetGenericArguments () [0]; bool b1 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { s }); diff --git a/mono/mini/mini-arm64.c.REMOVED.git-id b/mono/mini/mini-arm64.c.REMOVED.git-id index 19a6eff2a0..821f33b53e 100644 --- a/mono/mini/mini-arm64.c.REMOVED.git-id +++ b/mono/mini/mini-arm64.c.REMOVED.git-id @@ -1 +1 @@ -45b7475bd018ebdca6a93694ee46f5f39aeec427 \ No newline at end of file +24a4383066365bf923df0da696742ee86c15f31d \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index b536355de9..0b46d18a63 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/8d13a84" +#define FULL_VERSION "explicit/89cabf4" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 2387e8c269a2644a7f805ead5324f411b17273a0..40a5e3ba5dcbffae11019d00708be0b5ca88cbaa 100644 GIT binary patch delta 21 ccmbQIHBW296D|%zBLxEsD+8m=Z@7%O08k4CqW}N^ delta 21 ccmbQIHBW296D|$|3k3rUD?^jbZ@7%O08m*5s{jB1 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index dafa81308e..3dda2dce57 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -05115d4cd20ba66c75106079c5feb6c381440b04 \ No newline at end of file +58f073f1d77105500181bed689643a387e7d0ae3 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 52bd6e3ad14c8b6df7bbbbddbb8dbc104fa8496f..5afbf2924704795db60777b3517ab2fb7f07a0d6 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et_k%EDRm4VS_Q^hHA09T6!*#H0l delta 21 ccmX?Ef3kjqt|Etlg@S>Fm7&RIQ^hHA09V-t;Q#;t diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 2d9d46ab2b..5df66a4d5b 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -c7d46f3359b1f28c94a222c5bb272ddf71a3f27b \ No newline at end of file +f3bc5bf3b2ed1165648b3f6fa9ff00172a16359d \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 3db0b5916140136b729ced316a92d895e24a6360..6ebbfd572c0e3e5abf29b626849bb51c1f4d92d6 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19EL^;1{PKZMw|K73$y@daR)U3 delta 23 ecmeyri1Gg-#trQ190nE&1{PL^CY$-y3$y@dzXv@4 diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 403b454cb8..ac5247cd73 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -dbb6f39c9e1ce4d2d5d613c2eed0dac60f4f965e \ No newline at end of file +278c2361d6d84bc0a57243af797db1a3b0c10ebd \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 089a4cb55e..95a2230c55 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.16.0.152\n" +"Project-Id-Version: mono 5.16.0.153\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-09-08 08:14+0000\n" +"POT-Creation-Date: 2018-09-12 08:02+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 53b805203d42c416132d59865ffd8f383466c485..90f674023f7fc9d56a9012190d4a64cdb2eb4dfd 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}ISh>y3@oe+j5eoEWo!okbu0+0 delta 23 fcmaF1gXP%{mJP8}ISecm3@oe+O*W@aWo!okb$ST1 diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index efe3aee1b8..01a5261461 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -e9657c923c63594d04ada25bb4fbd903685ac88c \ No newline at end of file +a383c2d7b59221ba7e4ff8d77013d4ee71ceb005 \ No newline at end of file