From 526ff2cf7848dca1310960d26e5f35faad889138 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 1 Sep 2018 08:21:58 +0000 Subject: [PATCH] Imported Upstream version 5.16.0.135 Former-commit-id: 28d9e60fa3ef68cbdb55d4aeeb9e18679dc66b69 --- 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/metadata/loader.c | 2 ++ mono/mini/Makefile.am | 1 - mono/mini/Makefile.am.in | 1 - mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/arch-stubs.c | 6 ++++++ mono/mini/debugger-agent.c.REMOVED.git-id | 2 +- mono/mini/exceptions-amd64.c | 6 ++++++ mono/mini/exceptions-arm.c | 9 +++++++++ mono/mini/exceptions-arm64.c | 6 ++++++ mono/mini/interp/interp.c.REMOVED.git-id | 2 +- mono/mini/mini-exceptions.c.REMOVED.git-id | 2 +- mono/mini/mini-runtime.h | 12 +++++++----- mono/mini/mini-wasm-debugger.c | 0 mono/mini/mini-wasm.c | 2 +- mono/mini/mini.h.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/utils/mono-compiler.h | 6 ++++++ mono/utils/mono-stack-unwinding.h | 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 +- 61 files changed, 88 insertions(+), 68 deletions(-) delete mode 100644 mono/mini/mini-wasm-debugger.c diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 6a25b393cc..6d4000a030 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -ad5c394c5eaa6733f3dfbdb3f444a98a4952d109 \ No newline at end of file +4d4ef565049e2cd1fa0bf44be14ae23d425026b8 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d357c65e76..6f6e6678a5 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -07de5a7327b030685cf322da0ea00819caf97b99 \ No newline at end of file +9e0a9efcb9f0156b8fa33eba4a59a8ed823bebc7 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 4ef2bfca92..01882f7c77 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.127"; + public const string MonoVersion = "5.16.0.135"; 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 8bd7221619..47692d4344 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 (16384); + readBuffer = new BufferOffsetSize2 (16834); 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 ef9ebead1d..52d1be27ee 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 : IDisposable + class MonoTlsStream { #if SECURITY_DEP readonly MonoTlsProvider provider; @@ -136,7 +136,6 @@ namespace Mono.Net.Security request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate); else { request.ServicePoint.UpdateClientCertificate (null); - sslStream.Dispose (); sslStream = null; } } @@ -155,13 +154,5 @@ 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 5fd7e013a9..b79b481ea7 100644 --- a/mcs/class/System/System.Net/WebConnection.cs +++ b/mcs/class/System/System.Net/WebConnection.cs @@ -405,7 +405,6 @@ namespace System.Net void CloseSocket () { lock (this) { - Debug ($"WC CLOSE SOCKET: Cnc={ID} NS={networkStream} TLS={monoTlsStream}"); if (networkStream != null) { try { networkStream.Dispose (); @@ -413,13 +412,6 @@ 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 a9842de44a..41d37297ea 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 5a236393b7..9a8ddd5f89 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 @@ -3415b4700e5e7f96b90170d92495cca6cbd1427d \ No newline at end of file +69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 \ 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 912090faf4..37baff2637 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 @@ -d771de342ef8174e767368ae53cb13435d62f751 \ No newline at end of file +41237ab35261a093d70cfb46a706988944a2fe91 \ 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 3545f14f6bcca287cb2abdf9728fa24bc388df27..e3a8b21c275206e2dc8ea6b3c8c9654eba10027a 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZsIrHgregs [AMD64_RIP]++; } + +void +mono_arch_do_ip_adjustment (MonoContext *ctx) +{ + ctx->gregs [AMD64_RIP]--; +} diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c index 264b9f53ad..8278e0440e 100644 --- a/mono/mini/exceptions-arm.c +++ b/mono/mini/exceptions-arm.c @@ -639,3 +639,12 @@ mono_arch_undo_ip_adjustment (MonoContext *ctx) if (mono_arm_thumb_supported ()) ctx->pc |= 1; } + +void +mono_arch_do_ip_adjustment (MonoContext *ctx) +{ + /* Clear thumb bit */ + ctx->pc &= ~1; + + ctx->pc--; +} diff --git a/mono/mini/exceptions-arm64.c b/mono/mini/exceptions-arm64.c index 945bc91ef3..416de6d76e 100644 --- a/mono/mini/exceptions-arm64.c +++ b/mono/mini/exceptions-arm64.c @@ -605,3 +605,9 @@ mono_arch_undo_ip_adjustment (MonoContext *ctx) { ctx->pc++; } + +void +mono_arch_do_ip_adjustment (MonoContext *ctx) +{ + ctx->pc--; +} diff --git a/mono/mini/interp/interp.c.REMOVED.git-id b/mono/mini/interp/interp.c.REMOVED.git-id index a9c1cd33ef..0e83ae94fb 100644 --- a/mono/mini/interp/interp.c.REMOVED.git-id +++ b/mono/mini/interp/interp.c.REMOVED.git-id @@ -1 +1 @@ -c474a4690a17c6ac1ba8a0bd19ac2419c68b24f7 \ No newline at end of file +272c87416beb6b1f2c81432b9f635d7ead8264f5 \ No newline at end of file diff --git a/mono/mini/mini-exceptions.c.REMOVED.git-id b/mono/mini/mini-exceptions.c.REMOVED.git-id index fd17e5ab8e..9220d8d6be 100644 --- a/mono/mini/mini-exceptions.c.REMOVED.git-id +++ b/mono/mini/mini-exceptions.c.REMOVED.git-id @@ -1 +1 @@ -a984905c86090377b0630031ad2e25a436d6b861 \ No newline at end of file +9aaca6b472e5626585f9d689edd52a4109db5b46 \ No newline at end of file diff --git a/mono/mini/mini-runtime.h b/mono/mini/mini-runtime.h index a75aa06b87..6243537e5d 100644 --- a/mono/mini/mini-runtime.h +++ b/mono/mini/mini-runtime.h @@ -146,16 +146,18 @@ struct MonoJitTlsData { #endif }; +#define MONO_LMFEXT_DEBUGGER_INVOKE 1 +#define MONO_LMFEXT_INTERP_EXIT 2 +#define MONO_LMFEXT_INTERP_EXIT_WITH_CTX 3 + /* * This structure is an extension of MonoLMF and contains extra information. */ typedef struct { struct MonoLMF lmf; - gboolean debugger_invoke; - gboolean interp_exit; - MonoContext ctx; /* if debugger_invoke is TRUE */ - /* If interp_exit is TRUE */ - gpointer interp_exit_data; + int kind; + MonoContext ctx; /* valid if kind == DEBUGGER_INVOKE || kind == INTERP_EXIT_WITH_CTX */ + gpointer interp_exit_data; /* valid if kind == INTERP_EXIT || kind == INTERP_EXIT_WITH_CTX */ } MonoLMFExt; typedef void (*MonoFtnPtrEHCallback) (guint32 gchandle); diff --git a/mono/mini/mini-wasm-debugger.c b/mono/mini/mini-wasm-debugger.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mono/mini/mini-wasm.c b/mono/mini/mini-wasm.c index cd3f85655c..d30b9c9051 100644 --- a/mono/mini/mini-wasm.c +++ b/mono/mini/mini-wasm.c @@ -747,7 +747,7 @@ mono_wasm_current_bp_id (void) g_assert (((guint64)lmf->previous_lmf) & 2); MonoLMFExt *ext = (MonoLMFExt*)lmf; - g_assert (ext->interp_exit); + g_assert (ext->kind == MONO_LMFEXT_INTERP_EXIT || ext->kind == MONO_LMFEXT_INTERP_EXIT_WITH_CTX); MonoInterpFrameHandle *frame = ext->interp_exit_data; MonoJitInfo *ji = mini_get_interp_callbacks ()->frame_get_jit_info (frame); guint8 *ip = mini_get_interp_callbacks ()->frame_get_ip (frame); diff --git a/mono/mini/mini.h.REMOVED.git-id b/mono/mini/mini.h.REMOVED.git-id index b7387f52d1..cbdeb8c8a6 100644 --- a/mono/mini/mini.h.REMOVED.git-id +++ b/mono/mini/mini.h.REMOVED.git-id @@ -1 +1 @@ -12ebc1be2df609999cee08a4eb9f6ffb90050f17 \ No newline at end of file +64231b50d67cdac68b1aaee8cf93c7a07c0d1f46 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 47e6f34a31..f0612b18bf 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/43e7e83" +#define FULL_VERSION "explicit/ac8b05bd" diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h index f659cdeaf1..772b1b4b9b 100644 --- a/mono/utils/mono-compiler.h +++ b/mono/utils/mono-compiler.h @@ -122,6 +122,12 @@ typedef SSIZE_T ssize_t; #define MONO_COLD #endif +#ifdef __GNUC__ +#define MONO_NO_OPTIMIZATION __attribute__ ((optimize("O0"))) +#else +#define MONO_NO_OPTIMIZATION +#endif + #if defined (__GNUC__) && defined (__GNUC_MINOR__) && defined (__GNUC_PATCHLEVEL__) #define MONO_GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #endif diff --git a/mono/utils/mono-stack-unwinding.h b/mono/utils/mono-stack-unwinding.h index 01cb513f83..3225ac5069 100644 --- a/mono/utils/mono-stack-unwinding.h +++ b/mono/utils/mono-stack-unwinding.h @@ -26,7 +26,9 @@ typedef enum { FRAME_TYPE_INTERP = 4, /* Frame for transitioning from interpreter to managed code */ FRAME_TYPE_INTERP_TO_MANAGED = 5, - FRAME_TYPE_NUM = 6 + /* same, but with MonoContext */ + FRAME_TYPE_INTERP_TO_MANAGED_WITH_CTX = 6, + FRAME_TYPE_NUM = 7 } MonoStackFrameType; typedef enum { diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index be799eca39bd0a5e7c0149dc26b852a1796c6ef0..8c65840394dcee86b4e6965e837ea25c4537b274 100644 GIT binary patch delta 17 YcmbQIHBW29BQ6$8T?50-&$ukO06J*}-2eap delta 17 YcmbQIHBW29BQ6#TU1NjI&$ukO06K34-T(jq diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index c80f54e527..5d2f96f6a6 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -7e5f7d41a7c415141cd3d6f620757af399431574 \ No newline at end of file +c97f53c1a02209c0dc09fe8b6312e60f7fa52bef \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 4b88e0d4a8464272491863eb7d9b9989e6350abc..8c389c694f8c82678e540e5c734af4d28f0ecf9f 100644 GIT binary patch delta 17 YcmX?Ef3kjqwjztAu7TlZeZ^UF06=L56951J delta 17 YcmX?Ef3kjqwjzs#uCc*peZ^UF06=dB6aWAK diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index d1c2d03f2a..d266450821 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -67cf3696b5c2921e8e030d9cfde8aa56e9664a7c \ No newline at end of file +691d93b3677ff19915310263729d818f55720a48 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index f28481d3d7bfc3fcd88188f83bf34710048b5117..3397e3a3690b4f03a24c900364c6c3e5ef64ee13 100644 GIT binary patch delta 19 acmeyri1Gg-#tp3MES9\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index a2904bf26fd45fb33483dffc66a2e8968193d10d..d939dde80131108ba1c9a692c702fb9a0fdb9e1c 100644 GIT binary patch delta 19 bcmaF1gXP%{mJQKUSuAx83^&J5Wp4)nSgHr* delta 19 bcmaF1gXP%{mJQKUSuAvo4K~M5Wp4)nSg;4? diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index bf9c39ec5d..b7d14b1688 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -aab884301f62f739647e4e92906a73c8c18661af \ No newline at end of file +fcd4a445ec738115bf0045081739c897f7e438f0 \ No newline at end of file