From 85bcceff8c3b05ac1c1126428fda11f4af756a80 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 24 Oct 2019 09:00:20 +0000 Subject: [PATCH] Imported Upstream version 6.6.0.140 Former-commit-id: df9b1a83b9d14c916587f989bda9cb52f83aa23d --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/packages/gtk-sharp.py | 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.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.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.REMOVED.git-id | 2 +- .../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.REMOVED.git-id | 2 +- .../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.REMOVED.git-id | 2 +- .../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/exceptions-amd64.c | 12 +++++++++--- mono/mini/mini-runtime.c.REMOVED.git-id | 2 +- mono/mini/mini-runtime.h | 3 +++ mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- 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 +- 49 files changed, 57 insertions(+), 48 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index e5f5d7ed8e..56c66e1b56 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -3f0d7de26eb06e696651f0eb54e2feb5e8da4294 \ No newline at end of file +3ba21059031b27874a35373e00bdcd91bd47de13 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 8bae0f3cf7..630bf3255f 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -891b77322f23307c9bf054b7c13d05d760b9f650 \ No newline at end of file +e18300135ca50e7668c69f3ed3cd61dd3558d856 \ No newline at end of file diff --git a/external/bockbuild/packages/gtk-sharp.py b/external/bockbuild/packages/gtk-sharp.py index ea895647ac..0760dee19c 100644 --- a/external/bockbuild/packages/gtk-sharp.py +++ b/external/bockbuild/packages/gtk-sharp.py @@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package): Package.__init__(self, 'gtk-sharp', sources=['git://github.com/mono/gtk-sharp.git'], git_branch='gtk-sharp-2-12-branch', - revision='6a98cdb3414a760d44eee5bd4b17224a6762d7ad', + revision='dedce8ddbe37ae467f18ff785255e04fd9ccd782', override_properties={ 'configure': './bootstrap-2.12 --prefix=%{package_prefix}', } diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index df575bfbd7..ace6f521d8 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.6.0.133"; + public const string MonoVersion = "6.6.0.140"; 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/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index 20eafd7377..724052fefd 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c0fc742e67ebd432c14b6b616747368cbc5080a \ No newline at end of file +454ae59b63749df1c592dc2130fa7213b2ef0e9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 5c5bcda23f..0799c87a60 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f \ No newline at end of file +a5c6aed95ba8bc49e3c1b969120cb70f6718271d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index bfd1e66bc3..f993277ee9 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -0b9f8d1e37f9c05962c7898562f1f574dfabb0dc \ No newline at end of file +912f8605f6a11f646d7e49ab09f34a1701fd9a3d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fb9b7326f2..f424dec54b 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -29cb409d7fba33bd16be5379f326276c7f810d0f \ No newline at end of file +358ce5082e789676e06fdf6e7a1279f4186d31a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index e3af0d3091..6b44fd6c7c 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -19412dd30bb7279a59d82b7da07ccbe8307a1a3b \ No newline at end of file +40787214b81a44904dfc445b7ad3740600a06e89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index ba8faf65bc..9bfc5005bc 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -386226aa05d1283286ef664640d8cd9695907824 \ No newline at end of file +24a1d0f66f4ff5e1eab59634988bbf3cf879f335 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 475d74d546..13235954cf 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c \ No newline at end of file +8b6dc65e0cbc140249fa33142feac2235b0940ed \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index 20eafd7377..724052fefd 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c0fc742e67ebd432c14b6b616747368cbc5080a \ No newline at end of file +454ae59b63749df1c592dc2130fa7213b2ef0e9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 5c5bcda23f..0799c87a60 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f \ No newline at end of file +a5c6aed95ba8bc49e3c1b969120cb70f6718271d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index bfd1e66bc3..f993277ee9 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -0b9f8d1e37f9c05962c7898562f1f574dfabb0dc \ No newline at end of file +912f8605f6a11f646d7e49ab09f34a1701fd9a3d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fb9b7326f2..f424dec54b 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -29cb409d7fba33bd16be5379f326276c7f810d0f \ No newline at end of file +358ce5082e789676e06fdf6e7a1279f4186d31a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index e3af0d3091..6b44fd6c7c 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -19412dd30bb7279a59d82b7da07ccbe8307a1a3b \ No newline at end of file +40787214b81a44904dfc445b7ad3740600a06e89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index ba8faf65bc..9bfc5005bc 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -386226aa05d1283286ef664640d8cd9695907824 \ No newline at end of file +24a1d0f66f4ff5e1eab59634988bbf3cf879f335 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 34a6ec488a..b909266f70 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -eabf1317215f7103b2ee8a2347ba0fa285af848a \ No newline at end of file +ac98f66f66258581ca21c1de9aa4f3802362d63b \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 475d74d546..13235954cf 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c \ No newline at end of file +8b6dc65e0cbc140249fa33142feac2235b0940ed \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index 20eafd7377..724052fefd 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c0fc742e67ebd432c14b6b616747368cbc5080a \ No newline at end of file +454ae59b63749df1c592dc2130fa7213b2ef0e9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 5c5bcda23f..0799c87a60 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f \ No newline at end of file +a5c6aed95ba8bc49e3c1b969120cb70f6718271d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index bfd1e66bc3..f993277ee9 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -0b9f8d1e37f9c05962c7898562f1f574dfabb0dc \ No newline at end of file +912f8605f6a11f646d7e49ab09f34a1701fd9a3d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fb9b7326f2..f424dec54b 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -29cb409d7fba33bd16be5379f326276c7f810d0f \ No newline at end of file +358ce5082e789676e06fdf6e7a1279f4186d31a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index e3af0d3091..6b44fd6c7c 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -19412dd30bb7279a59d82b7da07ccbe8307a1a3b \ No newline at end of file +40787214b81a44904dfc445b7ad3740600a06e89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index ba8faf65bc..9bfc5005bc 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -386226aa05d1283286ef664640d8cd9695907824 \ No newline at end of file +24a1d0f66f4ff5e1eab59634988bbf3cf879f335 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 34a6ec488a..b909266f70 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -eabf1317215f7103b2ee8a2347ba0fa285af848a \ No newline at end of file +ac98f66f66258581ca21c1de9aa4f3802362d63b \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 475d74d546..13235954cf 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c \ No newline at end of file +8b6dc65e0cbc140249fa33142feac2235b0940ed \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index 20eafd7377..724052fefd 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -7c0fc742e67ebd432c14b6b616747368cbc5080a \ No newline at end of file +454ae59b63749df1c592dc2130fa7213b2ef0e9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 5c5bcda23f..0799c87a60 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f \ No newline at end of file +a5c6aed95ba8bc49e3c1b969120cb70f6718271d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index d818a99621..e42788b0df 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -ba640b205bf9fb1e497b8e1ca68312b85a66d5b3 \ No newline at end of file +16e2e3adf1a2a080499bc5855e0b65eee61d4a97 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fb9b7326f2..f424dec54b 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -29cb409d7fba33bd16be5379f326276c7f810d0f \ No newline at end of file +358ce5082e789676e06fdf6e7a1279f4186d31a7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index e3af0d3091..6b44fd6c7c 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -19412dd30bb7279a59d82b7da07ccbe8307a1a3b \ No newline at end of file +40787214b81a44904dfc445b7ad3740600a06e89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index ba8faf65bc..9bfc5005bc 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -386226aa05d1283286ef664640d8cd9695907824 \ No newline at end of file +24a1d0f66f4ff5e1eab59634988bbf3cf879f335 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 34a6ec488a..b909266f70 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -eabf1317215f7103b2ee8a2347ba0fa285af848a \ No newline at end of file +ac98f66f66258581ca21c1de9aa4f3802362d63b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 40aa9f41a1..b51dc269b5 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d704d5d4f1b92241acc54dd43a7dfd89c7079d01 \ No newline at end of file +fdfe40a5a91f2b3d7b9e372889b8b2b2e27b8745 \ No newline at end of file diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c index f7002f5e63..0b6e8158e2 100644 --- a/mono/mini/exceptions-amd64.c +++ b/mono/mini/exceptions-amd64.c @@ -861,12 +861,14 @@ prepare_for_guard_pages (MonoContext *mctx) } static void -altstack_handle_and_restore (MonoContext *ctx, MonoObject *obj, gboolean stack_ovf) +altstack_handle_and_restore (MonoContext *ctx, MonoObject *obj, guint32 flags) { MonoContext mctx; MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), MONO_CONTEXT_GET_IP (ctx), NULL); + gboolean stack_ovf = (flags & 1) != 0; + gboolean nullref = (flags & 2) != 0; - if (!ji) + if (!ji || (!stack_ovf && !nullref)) mono_handle_native_crash ("SIGSEGV", ctx, NULL); mctx = *ctx; @@ -888,6 +890,10 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s gpointer *sp; int frame_size; MonoContext *copied_ctx; + gboolean nullref = TRUE; + + if (!mono_is_addr_implicit_null_check (fault_addr)) + nullref = FALSE; if (stack_ovf) exc = mono_domain_get ()->stack_overflow_ex; @@ -914,7 +920,7 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s UCONTEXT_REG_RSP (sigctx) = (unsigned long)(sp - 1); UCONTEXT_REG_RDI (sigctx) = (unsigned long)(copied_ctx); UCONTEXT_REG_RSI (sigctx) = (guint64)exc; - UCONTEXT_REG_RDX (sigctx) = stack_ovf; + UCONTEXT_REG_RDX (sigctx) = (stack_ovf ? 1 : 0) | (nullref ? 2 : 0); #endif } diff --git a/mono/mini/mini-runtime.c.REMOVED.git-id b/mono/mini/mini-runtime.c.REMOVED.git-id index 2c6f6cbb4d..16a0e113fe 100644 --- a/mono/mini/mini-runtime.c.REMOVED.git-id +++ b/mono/mini/mini-runtime.c.REMOVED.git-id @@ -1 +1 @@ -4cf065806b5f00551b85dba0e65c32133b9353b5 \ No newline at end of file +92b47e1786fd50b90c2674b0737ae4562363279a \ No newline at end of file diff --git a/mono/mini/mini-runtime.h b/mono/mini/mini-runtime.h index 1484a2268b..13268e59f6 100644 --- a/mono/mini/mini-runtime.h +++ b/mono/mini/mini-runtime.h @@ -555,6 +555,9 @@ mono_dump_native_crash_info (const char *signal, MonoContext *mctx, MONO_SIG_HAN void mono_post_native_crash_handler (const char *signal, MonoContext *mctx, MONO_SIG_HANDLER_INFO_TYPE *info, gboolean crash_chaining); +gboolean +mono_is_addr_implicit_null_check (void *addr); + /* * Signal handling */ diff --git a/mono/mini/version.h b/mono/mini/version.h index 594e2897e2..94dc5f64ff 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/baa12e5" +#define FULL_VERSION "explicit/1b2e536" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index 7b45dbc879..eed954ce12 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1496,10 +1496,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@test-local: -@HOST_WIN32_TRUE@test-local: @CROSS_COMPILE_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local: +@CROSS_COMPILE_TRUE@test-local: +@HOST_WIN32_TRUE@test-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 5ace97fbb32131aa44a494b35bf48a222ae2abf3..7953e88a9c05613366dd6e94abfcde939da7e022 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKB1p^B!W5dmFxQw^}N`MA- delta 20 bcmbQIHBW29Q!aL61p^B!Bg@TixQw^}N}UFL diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 9883f5b25b..012ef74e9b 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -343ac949ba05c7f988fb08025570f6122b2f236b \ No newline at end of file +33a6cd4c47a6114d6e8f269d9b526e9a05f176fd \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index f0f25c90a88e4b8a0eb5a7870b7c0f408952c8b8..4f89b18285a2b0af1b3cd6d648f22669c6745a36 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)6f`NsVvEgP@#VK+CQJ@B_ delta 20 bcmX?Ef3kjqo+7)kf`NsVk>zGn#VK+CQN0GT diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index d25fbc7edd..4eafb4280c 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -be560d6ec27a6f268765e2bd4c498dfaa270a0e1 \ No newline at end of file +a2a6da1519eb04f905b8b9800a485bd1702c79b0 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 5e3387fbd9b566782ca3e87df470c7b65d025e59..b65e678e5d16d4e3ae84412543457a80eb74f4ec 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m>?R5Z7FNcFoB7oXv;bi82M7QF delta 22 dcmeyri1Gg-#tj_m?8XWP7FI@\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 57cc5d82769e29f9b917ef86bcd7f502db4d399d..d36f395ec5553775fcc8891b59a569f293f1d210 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*-aD-EUb(TH>XZzYzF{s=?H!R delta 22 ecmaF1gXP%{mJM-J*^LzpEUb(yH>XZzYzF{t1_*=z diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 6ba5069187..972f903d7e 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -dc85ffcd2e8de040b54a5d4da1453718343aa1e8 \ No newline at end of file +a8d5dcb96991368b9ee54e5d527fc4b81d538cc2 \ No newline at end of file