From fa33682fe91759a4d36d622f616ef8059ab1d3bf Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 29 Mar 2018 08:55:07 +0000 Subject: [PATCH] Imported Upstream version 5.10.1.20 Former-commit-id: 5b3996c7bee2799f7bfbfbf7251fe77a8f2fbc7e --- 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.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/iltests.il | 41 ++++++++++++++++++ mono/mini/method-to-ir.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 +- 36 files changed, 73 insertions(+), 32 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 1857962e9b..18dabda9a1 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -a5c0065103184fbaa7231339255466d293eb6cb4 \ No newline at end of file +4f949ee4d3493ae84799bc004909d8c02cd95387 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 8e9f775c75..6844994c0a 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -5d294b134504dc52fee1b91f42902f1c90acbf4b \ No newline at end of file +5bc587207ca36625c9e0ef11bedf144610db22df \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 8ab4ada781..c812581222 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.10.1.16"; + public const string MonoVersion = "5.10.1.20"; 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/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id index 2652615f55..116e3ef40f 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f2f96f9bda35eb2afd682c6662ed6806eec87a2b \ No newline at end of file +e12df6cf6f11a9623646797366fde0c96a9be4e7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id index de225ece01..3f6a3ffe3d 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a1a358ddd05a21727290fb24567d3aa2db41f89d \ No newline at end of file +cfc62ef7d708a82187f2ddbacfde7d94150c89cf \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id index ee8de0bbfa..a667e80824 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41 \ No newline at end of file +fa34ee078856c45d24d70629b13266372102f5af \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id index 0990ccedcc..57cca7d3e8 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -559d120991ef0e0340236244798c245608383081 \ No newline at end of file +36a5fe92bcd5f99696793ec32c77a0cbd800fa4f \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id index 6bd24d9054..8f1039e940 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -79211fe5cf0a63d090b3d93be588eab06e3e4634 \ No newline at end of file +d8780bbd16a07188ff2559e6fbee1debec06ebc3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id index 8f742534f7..ae7d56a5a7 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -37e6920b265b3c9d89380a0bc0d1417aed391332 \ No newline at end of file +3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id index ea65a0f586..2413c48c82 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ef652b72c7cf1aead77b7090c689b662fae6699a \ No newline at end of file +8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id index 2652615f55..116e3ef40f 100644 --- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f2f96f9bda35eb2afd682c6662ed6806eec87a2b \ No newline at end of file +e12df6cf6f11a9623646797366fde0c96a9be4e7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id index de225ece01..3f6a3ffe3d 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a1a358ddd05a21727290fb24567d3aa2db41f89d \ No newline at end of file +cfc62ef7d708a82187f2ddbacfde7d94150c89cf \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id index ee8de0bbfa..a667e80824 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41 \ No newline at end of file +fa34ee078856c45d24d70629b13266372102f5af \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id index 0990ccedcc..57cca7d3e8 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -559d120991ef0e0340236244798c245608383081 \ No newline at end of file +36a5fe92bcd5f99696793ec32c77a0cbd800fa4f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id index 6bd24d9054..8f1039e940 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -79211fe5cf0a63d090b3d93be588eab06e3e4634 \ No newline at end of file +d8780bbd16a07188ff2559e6fbee1debec06ebc3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id index 8f742534f7..ae7d56a5a7 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -37e6920b265b3c9d89380a0bc0d1417aed391332 \ No newline at end of file +3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id index ea65a0f586..2413c48c82 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ef652b72c7cf1aead77b7090c689b662fae6699a \ No newline at end of file +8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id index 2652615f55..116e3ef40f 100644 --- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f2f96f9bda35eb2afd682c6662ed6806eec87a2b \ No newline at end of file +e12df6cf6f11a9623646797366fde0c96a9be4e7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id index de225ece01..3f6a3ffe3d 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a1a358ddd05a21727290fb24567d3aa2db41f89d \ No newline at end of file +cfc62ef7d708a82187f2ddbacfde7d94150c89cf \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id index ee8de0bbfa..a667e80824 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -17e7ea7a2f9a9e89d52ae3f82e397b2a2f72af41 \ No newline at end of file +fa34ee078856c45d24d70629b13266372102f5af \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id index 0990ccedcc..57cca7d3e8 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -559d120991ef0e0340236244798c245608383081 \ No newline at end of file +36a5fe92bcd5f99696793ec32c77a0cbd800fa4f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id index 6bd24d9054..8f1039e940 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -79211fe5cf0a63d090b3d93be588eab06e3e4634 \ No newline at end of file +d8780bbd16a07188ff2559e6fbee1debec06ebc3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id index 8f742534f7..ae7d56a5a7 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -37e6920b265b3c9d89380a0bc0d1417aed391332 \ No newline at end of file +3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id index ea65a0f586..2413c48c82 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ef652b72c7cf1aead77b7090c689b662fae6699a \ No newline at end of file +8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7 \ No newline at end of file diff --git a/mono/mini/iltests.il b/mono/mini/iltests.il index ac735ccbb3..3c51235872 100644 --- a/mono/mini/iltests.il +++ b/mono/mini/iltests.il @@ -3136,4 +3136,45 @@ L_3: ldc.i4.0 ret } + + // Test that calli does signature checking + .method public static int32 calli_sig_check (string s) cil managed + { + .maxstack 16 + ldc.i4.0 + ret + } + + .method public static int32 calli_sig_check_2 () cil managed + { + .maxstack 16 + + ldc.r4 1.13 + ldftn int32 Tests::calli_sig_check(string) + calli int32(string) + ret + } + + .method public static int32 test_0_calli_sig_check () cil managed + { + .custom instance void [TestDriver]CategoryAttribute::.ctor(string) = ( 01 00 0C 21 49 4E 54 45 52 50 52 45 54 45 52 00 00 ) // ...!INTERPRETER. + .custom instance void class [TestDriver]CategoryAttribute::'.ctor'(string) = (01 00 08 21 46 55 4C 4C 41 4F 54 00 00 ) // ...!FULLAOT.. + .maxstack 16 + + .try { + call int32 Tests::calli_sig_check_2() + pop + leave L0 + } catch [mscorlib]System.InvalidProgramException { + pop + leave L1 + } + + L0: + ldc.i4.1 + ret + L1: + ldc.i4.0 + ret + } } diff --git a/mono/mini/method-to-ir.c.REMOVED.git-id b/mono/mini/method-to-ir.c.REMOVED.git-id index 9d11886e82..5ece74df95 100644 --- a/mono/mini/method-to-ir.c.REMOVED.git-id +++ b/mono/mini/method-to-ir.c.REMOVED.git-id @@ -1 +1 @@ -9a8e885395e6128f4bb16a5ab2cbf0fd3828567e \ No newline at end of file +364b81e690f2369d9ddc8d556c4ac5747d3b02b6 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index fd3c8d973f..169ac78e29 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/bf27e25" +#define FULL_VERSION "explicit/34c3d01" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 22037f5cf03bee791a73d18b9f6cc0657f3938ff..a5ea773cca082cfb8bd2598ed00dfe7a423e55f9 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aK(1p^B!Bg@TixQw^}O63NE delta 20 bcmbQIHBW29Q!aK31p^B!Ba_WzGn#VK+CQUwOM delta 20 bcmX?Ef3kjqo+7)2f`NsVk;!IL#VK+CQQHQx diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index f980c59156..88293ba517 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -7481e68f34207388d86528e13af4f23cb34d74d9 \ No newline at end of file +baee75b09631be3ebba5b2ba6c5dfd3dc4a261ef \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 99f5330ae3aeeccb67e7630e099dd06e6e059f72..b832ce5fbd223dfb579f435c82d05bb2e02b9e6f 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?3M}!7FI@=p_J7FI?koB7oXv;bi(2Mz!L diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index a320f9094d..adf705af79 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -11c2a8b9b62b957355744562fed3bbf9813e4fb8 \ No newline at end of file +f8aa0288faabf55a27dbff9272901fd97d489031 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 061c615593..e4d094a725 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.1.16\n" +"Project-Id-Version: mono 5.10.1.20\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-03-28 08:24+0000\n" +"POT-Creation-Date: 2018-03-29 08:29+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 e741a79d207bad82a29c9b271604b55ae8f3ed65..886d2f7fa1969deeda9f9e240975ebfc50a1f687 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0_eEUb(yH>XZzYzF{tP6&zs delta 22 ecmaF1gXP%{mJM-J*)0?dEUb)7Hm6QyYzF{tBnX56 diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index a9d3fdcbae..3c6e078130 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -4877001d3b254cb1229617274452316b370cd69d \ No newline at end of file +cd4bb5780a7848ae1940f74b0200283b23e2497a \ No newline at end of file