From db4ed25f81c61a6d8f3e80b6a91e3d6522ea4e36 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 21 Nov 2018 08:23:59 +0000 Subject: [PATCH] Imported Upstream version 5.18.0.209 Former-commit-id: 38dd74676fc3bf0e4682ced371bcc4f8cecc261c --- 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/gshared.cs | 12 ++++++++++-- mono/mini/mini-arm64-gsharedvt.c | 4 +++- 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 +- 47 files changed, 51 insertions(+), 41 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 9c835d5f77..fb0e147767 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -6226dff39317c3229c933cee75df73f7c3b8c747 \ No newline at end of file +399f1f2ab50a8eda2245a1b793d8e4bc1f7a1097 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 21afe46d92..0636118e18 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -41df5100fb174fb73affcbd29506df6421ebd621 \ No newline at end of file +9bb330a0f8bac481ff50d139facd2f3a7ce9cae6 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 140a3eabbd..238e49fe97 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.18.0.208"; + public const string MonoVersion = "5.18.0.209"; 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/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id index ebe7aff995..c25306800d 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -cb78f90e4bc50c7e4ef308e99d1e02c7281b9a2f \ No newline at end of file +77a11cfe4f3a150828e34a5080e8c337c31cb438 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id index b4c74f88ac..4b627ad0dc 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -fa3fb277ab2d51159b85763ee891d209df5e57cc \ No newline at end of file +dc9d94a97a9b463168d01177053779a833f86377 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id index cbea202b51..aa78127df6 100644 --- a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -9b8c5c18dc03b16335f539ba331c136e5becccba \ No newline at end of file +82b0c30b4b4bbaa45c98b3898a93927dbc7ba7d1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll index 8484f33ac7030df6e37d61a80f149b70703e65ad..95fbd82c6949f291331aa73d8bd0533b85fafdfe 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZA?>2jfsD0`0W=H{jVOF19|Y+_j=EE-OxhcNx6lj$Y6b&2 Q04kTDeE}-BXA=RLaGgIDga7~l delta 58 zcmZqZU~A}Lo6y1XDW~9JW6#zeMiU+Z)Az;ySa@za?vWL(2jfsD0`0W=H{jVOF19|Y+_j=EE-OxhcNx6lj$Y6b&2 Q04kTDeE}-BXA=RLaGgIDga7~l delta 58 zcmZqZU~A}Lo6y1XDW~9JW6#zeMiU+Z)Az;ySa@za?vWL(2jfsD0`0W=H{jVOF19|Y+_j=EE-OxhcNx6lj$Y6b&2 Q04kTDeE}-BXA=RLaGgIDga7~l delta 58 zcmZqZU~A}Lo6y1XDW~9JW6#zeMiU+Z)Az;ySa@za?vWL(2jfsD0`0W=H{jVOF19|Y+_j=EE-OxhcNx6lj$Y6b&2 Q04kTDeE}-BXA=RLaGgIDga7~l delta 58 zcmZqZU~A}Lo6y1XDW~9JW6#zeMiU+Z)Az;ySa@za?vWL( (T t, T2[] arr, int dummy1, int a2, int a3, int a4, int a5, int a6, int a7, int dummy8, T2 i1, T2 i2, T2 i3, T2 i4); } @@ -1734,7 +1736,10 @@ public class Tests BStruct s) { return s.a + s.b + s.c + s.d; } - + public int Floats (T t, double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, + double d9, double d10, float s11, float s12) { + return (int)d9 + (int)d10 + (int)s11 + (int)s12; + } public void Generic (T t, T2[] arr, int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, T2 i1, T2 i2, T2 i3, T2 i4) { arr [0] = i1; arr [1] = i2; @@ -1764,10 +1769,13 @@ public class Tests int res6 = o.UInts (new EmptyStruct (), 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4); if (res6 != 10) return 6; + int res7 = o.Floats (new EmptyStruct (), 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 10.0, 20.0, 30.0f, 40.0f); + if (res7 != 100) + return 7; int[] arr = new int [4]; o.Generic (new EmptyStruct (), arr, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4); if (arr [0] != 1 || arr [1] != 2 || arr [2] != 3 || arr [3] != 4) - return 7; + return 8; return 0; } diff --git a/mono/mini/mini-arm64-gsharedvt.c b/mono/mini/mini-arm64-gsharedvt.c index 09be1a059e..d60bee2f34 100644 --- a/mono/mini/mini-arm64-gsharedvt.c +++ b/mono/mini/mini-arm64-gsharedvt.c @@ -105,6 +105,8 @@ get_arg_slots (ArgInfo *ainfo, int **out_slots) src [i] = map_reg (sreg + i); break; case ArgOnStack: + case ArgOnStackR4: + case ArgOnStackR8: nsrc = 1; src = g_malloc (nsrc * sizeof (int)); src [0] = map_stack_slot (sslot); @@ -253,7 +255,7 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si } if (nsrc) src [0] |= (arg_marshal << 18); - if (ainfo->storage == ArgOnStack && ainfo->slot_size != 8) { + if ((ainfo->storage == ArgOnStack || ainfo->storage == ArgOnStackR4) && ainfo->slot_size != 8) { GSharedVtArgSize arg_size = GSHAREDVT_ARG_SIZE_NONE; /* diff --git a/mono/mini/version.h b/mono/mini/version.h index 6ad404d97e..39401c54ee 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/e3a4484" +#define FULL_VERSION "explicit/7b9d9b3" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index cd346ab79de384e5f3904ce3466fe0d447097b28..f16de7eac7bc383dd4135e329126dd7a2fcdd1b9 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKx1p^B!1M|&qxQw^}N^1so delta 20 bcmbQIHBW29Q!aJ`1p^B!1GCL;?)37FGskoB7oXv;bhs2L=ED diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 081ea3dbb0..6a1ca7e392 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -1667c83cd1ff3408265deb369bcbc52e374a274b \ No newline at end of file +7c3ed4132cb0a3a3606db16ec7dfcc981b15bfdc \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 29b609cc54..a68f9af00d 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.18.0.208\n" +"Project-Id-Version: mono 5.18.0.209\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-11-20 08:06+0000\n" +"POT-Creation-Date: 2018-11-21 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 cb50716a4742c912017146892681b26db63004cd..f015ef18519cb0e51f497fc02455114019577bc2 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*$ov8EUXO7H>XZzYzF{s)Chh6 delta 22 ecmaF1gXP%{mJM-J*$os7EUXO7Hm6QyYzF{s!U%i- diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 33b74f98f5..c1fa23845d 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -d707c5c7bcc900329c8e5360558a0fea9393856e \ No newline at end of file +7e2e403dad06a459886c2dd7f8fb0bce27e6911c \ No newline at end of file