From 29319da08020ff62257bd3a14c272282f337efc9 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 30 Aug 2018 08:22:09 +0000 Subject: [PATCH] Imported Upstream version 5.16.0.127 Former-commit-id: 1babec92ec0b34d7fed163047451926d29f91441 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../MobileAuthenticatedStream.cs | 2 +- .../System/Mono.Net.Security/MonoTlsStream.cs | 11 ++++++++++- mcs/class/System/System.Net/WebConnection.cs | 8 ++++++++ mcs/class/System/System.Net/WebReadStream.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/System.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/System.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/System.dll.REMOVED.git-id | 2 +- .../1051600011/mcs.exe.REMOVED.git-id | 2 +- .../1051600011/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/ir-emit.h | 4 +--- mono/mini/local-propagation.c | 3 +++ mono/mini/mini-exceptions.c.REMOVED.git-id | 2 +- mono/mini/mini-llvm.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 +- 48 files changed, 60 insertions(+), 42 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index bd08ba0a59..6a25b393cc 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -5abf189e54335ac27c79ccacb2b531e11e5d47b4 \ No newline at end of file +ad5c394c5eaa6733f3dfbdb3f444a98a4952d109 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index ef87ec8957..d357c65e76 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -1b17b4391b9c108405382d26281745883c0aab41 \ No newline at end of file +07de5a7327b030685cf322da0ea00819caf97b99 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 6e390ec1c3..4ef2bfca92 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.123"; + public const string MonoVersion = "5.16.0.127"; 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/System/Mono.Net.Security/MobileAuthenticatedStream.cs b/mcs/class/System/Mono.Net.Security/MobileAuthenticatedStream.cs index 47692d4344..8bd7221619 100644 --- a/mcs/class/System/Mono.Net.Security/MobileAuthenticatedStream.cs +++ b/mcs/class/System/Mono.Net.Security/MobileAuthenticatedStream.cs @@ -77,7 +77,7 @@ namespace Mono.Net.Security Settings = settings; Provider = provider; - readBuffer = new BufferOffsetSize2 (16834); + readBuffer = new BufferOffsetSize2 (16384); writeBuffer = new BufferOffsetSize2 (16384); operation = Operation.None; } diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs b/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs index 52d1be27ee..ef9ebead1d 100644 --- a/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs +++ b/mcs/class/System/Mono.Net.Security/MonoTlsStream.cs @@ -50,7 +50,7 @@ using System.Security.Cryptography; namespace Mono.Net.Security { - class MonoTlsStream + class MonoTlsStream : IDisposable { #if SECURITY_DEP readonly MonoTlsProvider provider; @@ -136,6 +136,7 @@ namespace Mono.Net.Security request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate); else { request.ServicePoint.UpdateClientCertificate (null); + sslStream.Dispose (); sslStream = null; } } @@ -154,5 +155,13 @@ namespace Mono.Net.Security throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); #endif } + + public void Dispose () + { + if (sslStream != null) { + sslStream.Dispose (); + sslStream = null; + } + } } } diff --git a/mcs/class/System/System.Net/WebConnection.cs b/mcs/class/System/System.Net/WebConnection.cs index b79b481ea7..5fd7e013a9 100644 --- a/mcs/class/System/System.Net/WebConnection.cs +++ b/mcs/class/System/System.Net/WebConnection.cs @@ -405,6 +405,7 @@ namespace System.Net void CloseSocket () { lock (this) { + Debug ($"WC CLOSE SOCKET: Cnc={ID} NS={networkStream} TLS={monoTlsStream}"); if (networkStream != null) { try { networkStream.Dispose (); @@ -412,6 +413,13 @@ namespace System.Net networkStream = null; } + if (monoTlsStream != null) { + try { + monoTlsStream.Dispose (); + } catch { } + monoTlsStream = null; + } + if (socket != null) { try { socket.Dispose (); diff --git a/mcs/class/System/System.Net/WebReadStream.cs b/mcs/class/System/System.Net/WebReadStream.cs index 41d37297ea..a9842de44a 100644 --- a/mcs/class/System/System.Net/WebReadStream.cs +++ b/mcs/class/System/System.Net/WebReadStream.cs @@ -41,7 +41,7 @@ namespace System.Net } #if MONO_WEB_DEBUG - internal string ME => $"WRS({GetType ().Name}:Op={operation.ID})"; + internal string ME => $"WRS({GetType ().Name}:Op={Operation.ID})"; #else internal string ME => null; #endif 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 18dbd29cc3..5a236393b7 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 @@ -281f4ff84d2fc400f6114acdba054d724722338e \ No newline at end of file +3415b4700e5e7f96b90170d92495cca6cbd1427d \ 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 0d4938d2de..912090faf4 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 @@ -80ecae210739888e670c2cac82576c13e2a76fe1 \ No newline at end of file +d771de342ef8174e767368ae53cb13435d62f751 \ 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 678eea33f432c5a1c7c392d98e85f118d7ad81d4..3545f14f6bcca287cb2abdf9728fa24bc388df27 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZqbs(TfsD0`0W=H{mc{`$$6?Y!lhXS3Q?0bcx6lj$Y6b&0 Q04kTDeE}-BXA=RLaNmp=6951J delta 58 zcmV-A0LA}+hz5X&29SsZJDIe+fsD0`0W=H{UhOl~4(8ZFx+a;h*X8BSx6lj$Y6b%{ Q04kTDeE}-BXA=RLaPUePkN^Mx 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 083e85d579..4908c07e58 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 @@ -f873a8238fb04ff8f987393aed131c18983f3379 \ No newline at end of file +d3c03f4245b44d43dec965911e029c83ff5ec21f \ 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 92ecf02fa5..b1f1f3fef6 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 @@ -f87983e04ab5c6c733146c664bccaed3f2e48541 \ No newline at end of file +ec5c16e7fa46086d165ca589a888afb621cf27a0 \ 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 ee8b8953a4..fdcf7eced9 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 @@ -41598302670ed4a99808c4c195939cd237d5c0cc \ No newline at end of file +ba352fa31af7edf32625787dfc25b41eb0a363b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id index 81de247f51..8c3e04a0ed 100644 --- a/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id @@ -1 +1 @@ -ee989464bba21bcece33919ef912d836328b37d5 \ No newline at end of file +210d0a1bf843db79fb9e32d97345686d52789b15 \ 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 8fc107b475..9519e1d9af 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 @@ -624c13b19fcf97b1b09527edf61c8cc010716fb7 \ No newline at end of file +5d2fd270e40afe3fe9427a332c9b25fc1d10a049 \ 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 c2dbff5c9a..94273daf5d 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 @@ -227891804d7ff257fdd1483191b4071ad9f25997 \ No newline at end of file +e260715ef65ab4c6fb25b255262b4a8410b085f4 \ 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 18dbd29cc3..5a236393b7 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 @@ -281f4ff84d2fc400f6114acdba054d724722338e \ No newline at end of file +3415b4700e5e7f96b90170d92495cca6cbd1427d \ 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 0d4938d2de..912090faf4 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 @@ -80ecae210739888e670c2cac82576c13e2a76fe1 \ No newline at end of file +d771de342ef8174e767368ae53cb13435d62f751 \ 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 678eea33f432c5a1c7c392d98e85f118d7ad81d4..3545f14f6bcca287cb2abdf9728fa24bc388df27 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZqbs(TfsD0`0W=H{mc{`$$6?Y!lhXS3Q?0bcx6lj$Y6b&0 Q04kTDeE}-BXA=RLaNmp=6951J delta 58 zcmV-A0LA}+hz5X&29SsZJDIe+fsD0`0W=H{UhOl~4(8ZFx+a;h*X8BSx6lj$Y6b%{ Q04kTDeE}-BXA=RLaPUePkN^Mx 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 083e85d579..4908c07e58 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 @@ -f873a8238fb04ff8f987393aed131c18983f3379 \ No newline at end of file +d3c03f4245b44d43dec965911e029c83ff5ec21f \ 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 92ecf02fa5..b1f1f3fef6 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 @@ -f87983e04ab5c6c733146c664bccaed3f2e48541 \ No newline at end of file +ec5c16e7fa46086d165ca589a888afb621cf27a0 \ 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 ee8b8953a4..fdcf7eced9 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 @@ -41598302670ed4a99808c4c195939cd237d5c0cc \ No newline at end of file +ba352fa31af7edf32625787dfc25b41eb0a363b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id index 81de247f51..8c3e04a0ed 100644 --- a/mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id @@ -1 +1 @@ -ee989464bba21bcece33919ef912d836328b37d5 \ No newline at end of file +210d0a1bf843db79fb9e32d97345686d52789b15 \ 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 8fc107b475..9519e1d9af 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 @@ -624c13b19fcf97b1b09527edf61c8cc010716fb7 \ No newline at end of file +5d2fd270e40afe3fe9427a332c9b25fc1d10a049 \ 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 c2dbff5c9a..94273daf5d 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 @@ -227891804d7ff257fdd1483191b4071ad9f25997 \ No newline at end of file +e260715ef65ab4c6fb25b255262b4a8410b085f4 \ 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 18dbd29cc3..5a236393b7 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 @@ -281f4ff84d2fc400f6114acdba054d724722338e \ No newline at end of file +3415b4700e5e7f96b90170d92495cca6cbd1427d \ 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 0d4938d2de..912090faf4 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 @@ -80ecae210739888e670c2cac82576c13e2a76fe1 \ No newline at end of file +d771de342ef8174e767368ae53cb13435d62f751 \ 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 678eea33f432c5a1c7c392d98e85f118d7ad81d4..3545f14f6bcca287cb2abdf9728fa24bc388df27 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZqbs(TfsD0`0W=H{mc{`$$6?Y!lhXS3Q?0bcx6lj$Y6b&0 Q04kTDeE}-BXA=RLaNmp=6951J delta 58 zcmV-A0LA}+hz5X&29SsZJDIe+fsD0`0W=H{UhOl~4(8ZFx+a;h*X8BSx6lj$Y6b%{ Q04kTDeE}-BXA=RLaPUePkN^Mx 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 083e85d579..4908c07e58 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 @@ -f873a8238fb04ff8f987393aed131c18983f3379 \ No newline at end of file +d3c03f4245b44d43dec965911e029c83ff5ec21f \ 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 92ecf02fa5..b1f1f3fef6 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 @@ -f87983e04ab5c6c733146c664bccaed3f2e48541 \ No newline at end of file +ec5c16e7fa46086d165ca589a888afb621cf27a0 \ 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 ee8b8953a4..fdcf7eced9 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 @@ -41598302670ed4a99808c4c195939cd237d5c0cc \ No newline at end of file +ba352fa31af7edf32625787dfc25b41eb0a363b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051600011/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051600011/System.dll.REMOVED.git-id index 81de247f51..8c3e04a0ed 100644 --- a/mcs/class/lib/monolite-win32/1051600011/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051600011/System.dll.REMOVED.git-id @@ -1 +1 @@ -ee989464bba21bcece33919ef912d836328b37d5 \ No newline at end of file +210d0a1bf843db79fb9e32d97345686d52789b15 \ 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 8fc107b475..9519e1d9af 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 @@ -624c13b19fcf97b1b09527edf61c8cc010716fb7 \ No newline at end of file +5d2fd270e40afe3fe9427a332c9b25fc1d10a049 \ 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 c2dbff5c9a..94273daf5d 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 @@ -227891804d7ff257fdd1483191b4071ad9f25997 \ No newline at end of file +e260715ef65ab4c6fb25b255262b4a8410b085f4 \ No newline at end of file diff --git a/mono/mini/ir-emit.h b/mono/mini/ir-emit.h index ab535b0a3f..0248ea3124 100644 --- a/mono/mini/ir-emit.h +++ b/mono/mini/ir-emit.h @@ -726,9 +726,7 @@ handle_gsharedvt_ldaddr (MonoCompile *cfg) MONO_INST_NEW ((cfg), (inst), (OP_LCOMPARE_IMM)); \ inst->sreg1 = sr1; \ if (SIZEOF_REGISTER == 4 && COMPILE_LLVM (cfg)) { \ - guint64 _l = (imm); \ - inst->inst_imm = _l & 0xffffffff; \ - inst->inst_offset = _l >> 32; \ + inst->inst_l = (imm); \ } else { \ inst->inst_imm = (imm); \ } \ diff --git a/mono/mini/local-propagation.c b/mono/mini/local-propagation.c index 420dfb8b5a..f0cbf882a2 100644 --- a/mono/mini/local-propagation.c +++ b/mono/mini/local-propagation.c @@ -672,6 +672,9 @@ mono_local_cprop (MonoCompile *cfg) if ((def->opcode == OP_I8CONST) && (sizeof (gpointer) == 4)) { ins->inst_ls_word = def->inst_ls_word; ins->inst_ms_word = def->inst_ms_word; + } else if (regtype == 'l' && sizeof (gpointer) == 4) { + /* This can happen if the def was a result of an iconst+conv.i8, which is transformed into just an iconst */ + ins->inst_l = def->inst_c0; } else { ins->inst_imm = def->inst_c0; } diff --git a/mono/mini/mini-exceptions.c.REMOVED.git-id b/mono/mini/mini-exceptions.c.REMOVED.git-id index c65749438d..fd17e5ab8e 100644 --- a/mono/mini/mini-exceptions.c.REMOVED.git-id +++ b/mono/mini/mini-exceptions.c.REMOVED.git-id @@ -1 +1 @@ -40ef50b2c0ba1ddad1dce319ec42832e03b82600 \ No newline at end of file +a984905c86090377b0630031ad2e25a436d6b861 \ No newline at end of file diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index da1e6c16d9..d6d56061c5 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -6cde57fb2e9576dae47af23141d74131d94ebf9e \ No newline at end of file +82c015035f331d30e7c5f01bf4eebe843b1479e0 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 9ef2d07362..47e6f34a31 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/ca79abc" +#define FULL_VERSION "explicit/43e7e83" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index ee554c0d8e893c4a246a62a8945b891bb315173e..be799eca39bd0a5e7c0149dc26b852a1796c6ef0 100644 GIT binary patch delta 21 ccmbQIHBW296D|&80|f&MD+9C5Z@7%O08k|crvLx| delta 21 ccmbQIHBW296D|%TO9cZ9D+7zoZ@7%O08o$yu>b%7 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index ba9810b56b..c80f54e527 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -26f20bbd206b146eef89b7e5b7b356509ff275b3 \ No newline at end of file +7e5f7d41a7c415141cd3d6f620757af399431574 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 946b5e6c2e133ed7454e5b6e8b30a6a228bf290a..4b88e0d4a8464272491863eb7d9b9989e6350abc 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|EuAfr5dBm4Vr2Q^hHA09U03-2eap delta 21 ccmX?Ef3kjqt|Et#rGkNlm4U@(Q^hHA09X(P=Kufz diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 8f388cd1c5..d1c2d03f2a 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -1e4afd8f8cae4cb2e25a3bc7b2da905c1fe29193 \ No newline at end of file +67cf3696b5c2921e8e030d9cfde8aa56e9664a7c \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 17b0ab8ad42faee64a3a78f1a0c0ab68366084f6..f28481d3d7bfc3fcd88188f83bf34710048b5117 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19L5F;1{PKZW}Erd3$y@diw8LX delta 23 ecmeyri1Gg-#trQ197dK31{PKZ7MuCi3$y@d_6I`% diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 882a74b4c2..e37fb3cfb8 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -6b6e33f78ce9f29c2f9943220c744c0a1d403a55 \ No newline at end of file +505c9f2c21b5fd776a637bde5e96fe5be5bfad0c \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 776a432787..c30857a87a 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.123\n" +"Project-Id-Version: mono 5.16.0.127\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-08-29 08:08+0000\n" +"POT-Creation-Date: 2018-08-30 08:06+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 1834255793b6e8173d98c4298fa937ae86f4d741..a2904bf26fd45fb33483dffc66a2e8968193d10d 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAYy3@oe+%r>V^Wo!okbw&uU delta 23 fcmaF1gXP%{mJP8}IgBh73@oe+EH