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 c179ed5bc0..e53b6efdc4 100644 Binary files a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id index 50879f0dde..6523c38cb1 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -05a78b86faa962bd6fd539cb6e1c036423015b67 \ No newline at end of file +137e53090a3b9d034d9cdee4b01f6bdf40aa1e7e \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id index 6eca54268e..28cacfb3af 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0807f883fb30d5ab9bfd9bdc546942a00446dbc0 \ No newline at end of file +c5036e2cc77f7d959ce2d798dedd74839e9a8560 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id index 44efbb36be..41a1e29db3 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -425e639f233a9bfc939a22f8aa68e74ee2b4de0c \ No newline at end of file +8477297c872f1e2e251b787a735c2a67443bd7d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id index 210dde68a9..80a4aeffa6 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8ecce7fc3aed63d947cf9813488879f45fd9413f \ No newline at end of file +830e30e61d57d2d0c069f393b33a1cbe38ce17f3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id index e6d3f418ef..583bfa37cb 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -99a5a75b372ced7a2fabf5e5fda03667f2826ab7 \ No newline at end of file +2b733b7f8fe9c47d37851096d727256ea2d115fd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id index 194b3dad18..927ef166ad 100644 --- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/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-linux/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id index 46460db7a3..5dbe36f563 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/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-linux/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll index c179ed5bc0..e53b6efdc4 100644 Binary files a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id index 50879f0dde..6523c38cb1 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -05a78b86faa962bd6fd539cb6e1c036423015b67 \ No newline at end of file +137e53090a3b9d034d9cdee4b01f6bdf40aa1e7e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id index 6eca54268e..28cacfb3af 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0807f883fb30d5ab9bfd9bdc546942a00446dbc0 \ No newline at end of file +c5036e2cc77f7d959ce2d798dedd74839e9a8560 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id index 44efbb36be..41a1e29db3 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -425e639f233a9bfc939a22f8aa68e74ee2b4de0c \ No newline at end of file +8477297c872f1e2e251b787a735c2a67443bd7d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id index 210dde68a9..80a4aeffa6 100644 --- a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8ecce7fc3aed63d947cf9813488879f45fd9413f \ No newline at end of file +830e30e61d57d2d0c069f393b33a1cbe38ce17f3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id index e6d3f418ef..583bfa37cb 100644 --- a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -99a5a75b372ced7a2fabf5e5fda03667f2826ab7 \ No newline at end of file +2b733b7f8fe9c47d37851096d727256ea2d115fd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id index 194b3dad18..927ef166ad 100644 --- a/mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/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-win32/1051600011/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id index 46460db7a3..5dbe36f563 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/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-win32/1051600011/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll index c179ed5bc0..e53b6efdc4 100644 Binary files a/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll and b/mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll differ diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id index 50879f0dde..6523c38cb1 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -05a78b86faa962bd6fd539cb6e1c036423015b67 \ No newline at end of file +137e53090a3b9d034d9cdee4b01f6bdf40aa1e7e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id index 6eca54268e..28cacfb3af 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0807f883fb30d5ab9bfd9bdc546942a00446dbc0 \ No newline at end of file +c5036e2cc77f7d959ce2d798dedd74839e9a8560 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id index 44efbb36be..41a1e29db3 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -425e639f233a9bfc939a22f8aa68e74ee2b4de0c \ No newline at end of file +8477297c872f1e2e251b787a735c2a67443bd7d7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id index 210dde68a9..80a4aeffa6 100644 --- a/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -8ecce7fc3aed63d947cf9813488879f45fd9413f \ No newline at end of file +830e30e61d57d2d0c069f393b33a1cbe38ce17f3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id index e6d3f418ef..583bfa37cb 100644 --- a/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -99a5a75b372ced7a2fabf5e5fda03667f2826ab7 \ No newline at end of file +2b733b7f8fe9c47d37851096d727256ea2d115fd \ No newline at end of file diff --git a/mono/mini/aot-tests.cs b/mono/mini/aot-tests.cs index bdfbdf4cc6..c513eeb7a2 100644 --- a/mono/mini/aot-tests.cs +++ b/mono/mini/aot-tests.cs @@ -267,6 +267,12 @@ class Tests public static Nullable 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 2387e8c269..40a5e3ba5d 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ 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 52bd6e3ad1..5afbf29247 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ 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 3db0b59161..6ebbfd572c 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ 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 53b805203d..90f674023f 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ 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