Imported Upstream version 6.6.0.145
Former-commit-id: 7b9ac49eec5b7c53876267123a7e82a28442b22f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
790c4870fc
commit
6bc80ef735
@ -1 +1 @@
|
||||
216affdcd7058ced57cbcc824d956ec0e5b9a8bb
|
||||
dbd215ddfa6575b0f72244b0797c14b16ef56ab0
|
||||
@ -1 +1 @@
|
||||
6301d90f695640f2efd76e1111b8e40dadbe7e98
|
||||
ff8bab4d096e052edc6a86470e61fce296aa3547
|
||||
@ -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.144";
|
||||
public const string MonoVersion = "6.6.0.145";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
9c3f946a8273486a46e3ecb65e87585d7503c454
|
||||
71881495b1f82cf7dd536736476490aa25b24b6f
|
||||
@ -1 +1 @@
|
||||
8af00e06323acee9808efc1f44407e4730cfa44b
|
||||
df4c4bc282722985a4dc04d6213cf4a3e1fe96fc
|
||||
@ -1 +1 @@
|
||||
504693fe2c3e82688c9c46181b298c2d3170baf3
|
||||
57235227055118feb6cbdec959ced8d91f00f5d2
|
||||
@ -1 +1 @@
|
||||
d49fc5d9ffdec680a313e9b8599705a995e44eec
|
||||
a725dd4e63444fd8d8acf46f1396c29619e4043a
|
||||
@ -1 +1 @@
|
||||
17172a10d1658aa249b6cee31d22aada88407ee3
|
||||
ca2c1b8b184d036ef6ecca1809b0be2583a632ce
|
||||
@ -1 +1 @@
|
||||
241fdf7497e5a17407016be28c37cd277be1b093
|
||||
7afa6e2a39f7e229f359c89e62b2296d6d489bff
|
||||
@ -1 +1 @@
|
||||
fd7e169e571897602d6585cf7aea84e5cdab5eee
|
||||
a64205e1384bd4a39f5338f65895e4a77fa708ea
|
||||
@ -1 +1 @@
|
||||
9c3f946a8273486a46e3ecb65e87585d7503c454
|
||||
71881495b1f82cf7dd536736476490aa25b24b6f
|
||||
@ -1 +1 @@
|
||||
8af00e06323acee9808efc1f44407e4730cfa44b
|
||||
df4c4bc282722985a4dc04d6213cf4a3e1fe96fc
|
||||
@ -1 +1 @@
|
||||
504693fe2c3e82688c9c46181b298c2d3170baf3
|
||||
57235227055118feb6cbdec959ced8d91f00f5d2
|
||||
@ -1 +1 @@
|
||||
d49fc5d9ffdec680a313e9b8599705a995e44eec
|
||||
a725dd4e63444fd8d8acf46f1396c29619e4043a
|
||||
@ -1 +1 @@
|
||||
17172a10d1658aa249b6cee31d22aada88407ee3
|
||||
ca2c1b8b184d036ef6ecca1809b0be2583a632ce
|
||||
@ -1 +1 @@
|
||||
241fdf7497e5a17407016be28c37cd277be1b093
|
||||
7afa6e2a39f7e229f359c89e62b2296d6d489bff
|
||||
@ -1 +1 @@
|
||||
4f7a67995cd05f134275199b542a953c0725c525
|
||||
99d710c0156b0f70997d3ef3d9ebbbb1f277114e
|
||||
@ -1 +1 @@
|
||||
fd7e169e571897602d6585cf7aea84e5cdab5eee
|
||||
a64205e1384bd4a39f5338f65895e4a77fa708ea
|
||||
@ -1 +1 @@
|
||||
9c3f946a8273486a46e3ecb65e87585d7503c454
|
||||
71881495b1f82cf7dd536736476490aa25b24b6f
|
||||
@ -1 +1 @@
|
||||
8af00e06323acee9808efc1f44407e4730cfa44b
|
||||
df4c4bc282722985a4dc04d6213cf4a3e1fe96fc
|
||||
@ -1 +1 @@
|
||||
504693fe2c3e82688c9c46181b298c2d3170baf3
|
||||
57235227055118feb6cbdec959ced8d91f00f5d2
|
||||
@ -1 +1 @@
|
||||
d49fc5d9ffdec680a313e9b8599705a995e44eec
|
||||
a725dd4e63444fd8d8acf46f1396c29619e4043a
|
||||
@ -1 +1 @@
|
||||
17172a10d1658aa249b6cee31d22aada88407ee3
|
||||
ca2c1b8b184d036ef6ecca1809b0be2583a632ce
|
||||
@ -1 +1 @@
|
||||
241fdf7497e5a17407016be28c37cd277be1b093
|
||||
7afa6e2a39f7e229f359c89e62b2296d6d489bff
|
||||
@ -1 +1 @@
|
||||
4f7a67995cd05f134275199b542a953c0725c525
|
||||
99d710c0156b0f70997d3ef3d9ebbbb1f277114e
|
||||
@ -1 +1 @@
|
||||
fd7e169e571897602d6585cf7aea84e5cdab5eee
|
||||
a64205e1384bd4a39f5338f65895e4a77fa708ea
|
||||
@ -1 +1 @@
|
||||
9c3f946a8273486a46e3ecb65e87585d7503c454
|
||||
71881495b1f82cf7dd536736476490aa25b24b6f
|
||||
@ -1 +1 @@
|
||||
8af00e06323acee9808efc1f44407e4730cfa44b
|
||||
df4c4bc282722985a4dc04d6213cf4a3e1fe96fc
|
||||
@ -1 +1 @@
|
||||
1a0c935786d0da1c68a32d62f31c6ee2ba806e01
|
||||
2f0f8862d16b26c972121d85cfcd98703817c96b
|
||||
@ -1 +1 @@
|
||||
d49fc5d9ffdec680a313e9b8599705a995e44eec
|
||||
a725dd4e63444fd8d8acf46f1396c29619e4043a
|
||||
@ -1 +1 @@
|
||||
17172a10d1658aa249b6cee31d22aada88407ee3
|
||||
ca2c1b8b184d036ef6ecca1809b0be2583a632ce
|
||||
@ -1 +1 @@
|
||||
241fdf7497e5a17407016be28c37cd277be1b093
|
||||
7afa6e2a39f7e229f359c89e62b2296d6d489bff
|
||||
@ -1 +1 @@
|
||||
4f7a67995cd05f134275199b542a953c0725c525
|
||||
99d710c0156b0f70997d3ef3d9ebbbb1f277114e
|
||||
@ -1 +1 @@
|
||||
f3703b94ca76841dd08601ece8cc246afc76486e
|
||||
989f1ebf47fcedac9494b73e4c3ab6bcdaddc5b5
|
||||
@ -1 +1 @@
|
||||
a97fab8152600a4bc6c3bad742ef82745c31f87e
|
||||
f04ef7d857d73f20aea30e0462b9c3c3f39b920b
|
||||
@ -39,6 +39,7 @@
|
||||
#include <mono/metadata/gc-internals.h>
|
||||
#include <mono/metadata/mono-debug.h>
|
||||
#include <mono/utils/mono-mmap.h>
|
||||
#include <mono/utils/mono-state.h>
|
||||
|
||||
#include "mini.h"
|
||||
#include "mini-amd64.h"
|
||||
@ -66,7 +67,8 @@ static LONG CALLBACK seh_unhandled_exception_filter(EXCEPTION_POINTERS* ep)
|
||||
}
|
||||
#endif
|
||||
|
||||
mono_handle_native_crash ("SIGSEGV", NULL, NULL);
|
||||
if (mono_dump_start ())
|
||||
mono_handle_native_crash ("SIGSEGV", NULL, NULL);
|
||||
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
@ -868,8 +870,12 @@ altstack_handle_and_restore (MonoContext *ctx, MonoObject *obj, guint32 flags)
|
||||
gboolean stack_ovf = (flags & 1) != 0;
|
||||
gboolean nullref = (flags & 2) != 0;
|
||||
|
||||
if (!ji || (!stack_ovf && !nullref))
|
||||
mono_handle_native_crash ("SIGSEGV", ctx, NULL);
|
||||
if (!ji || (!stack_ovf && !nullref)) {
|
||||
if (mono_dump_start ())
|
||||
mono_handle_native_crash ("SIGSEGV", ctx, NULL);
|
||||
// if couldn't dump or if mono_handle_native_crash returns, abort
|
||||
abort ();
|
||||
}
|
||||
|
||||
mctx = *ctx;
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
#include <mono/metadata/debug-helpers.h>
|
||||
#include <mono/metadata/exception.h>
|
||||
#include <mono/metadata/mono-debug.h>
|
||||
#include <mono/utils/mono-state.h>
|
||||
|
||||
#include "mini.h"
|
||||
#include "mini-ppc.h"
|
||||
@ -673,7 +674,8 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
|
||||
abort ();
|
||||
}
|
||||
if (!ji)
|
||||
mono_handle_native_crash ("SIGSEGV", sigctx, siginfo);
|
||||
if (mono_dump_start ())
|
||||
mono_handle_native_crash ("SIGSEGV", sigctx, siginfo);
|
||||
/* setup a call frame on the real stack so that control is returned there
|
||||
* and exception handling can continue.
|
||||
* The frame looks like:
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
#include <mono/metadata/gc-internals.h>
|
||||
#include <mono/metadata/mono-debug.h>
|
||||
#include <mono/utils/mono-mmap.h>
|
||||
#include <mono/utils/mono-state.h>
|
||||
|
||||
#include "mini.h"
|
||||
#include "mini-x86.h"
|
||||
@ -64,8 +65,8 @@ LONG CALLBACK seh_unhandled_exception_filter(EXCEPTION_POINTERS* ep)
|
||||
return (*mono_old_win_toplevel_exception_filter)(ep);
|
||||
}
|
||||
#endif
|
||||
|
||||
mono_handle_native_crash ("SIGSEGV", NULL, NULL);
|
||||
if (mono_dump_start ())
|
||||
mono_handle_native_crash ("SIGSEGV", NULL, NULL);
|
||||
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
}
|
||||
@ -1130,7 +1131,10 @@ mono_arch_handle_altstack_exception (void *sigctx, MONO_SIG_HANDLER_INFO_TYPE *s
|
||||
if (!ji) {
|
||||
MonoContext mctx;
|
||||
mono_sigctx_to_monoctx (sigctx, &mctx);
|
||||
mono_handle_native_crash ("SIGSEGV", &mctx, siginfo);
|
||||
if (mono_dump_start ())
|
||||
mono_handle_native_crash ("SIGSEGV", &mctx, siginfo);
|
||||
else
|
||||
abort ();
|
||||
}
|
||||
/* setup a call frame on the real stack so that control is returned there
|
||||
* and exception handling can continue.
|
||||
|
||||
@ -231,7 +231,10 @@ MONO_SIG_HANDLER_FUNC (static, sigabrt_signal_handler)
|
||||
if (mono_chain_signal (MONO_SIG_HANDLER_PARAMS))
|
||||
return;
|
||||
mono_sigctx_to_monoctx (ctx, &mctx);
|
||||
mono_handle_native_crash ("SIGABRT", &mctx, info);
|
||||
if (mono_dump_start ())
|
||||
mono_handle_native_crash ("SIGABRT", &mctx, info);
|
||||
else
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
|
||||
@ -248,8 +251,14 @@ MONO_SIG_HANDLER_FUNC (static, sigterm_signal_handler)
|
||||
|
||||
// Will return when the dumping is done, so this thread can continue
|
||||
// running. Returns FALSE on unrecoverable error.
|
||||
if (!mono_threads_summarize_execute (&mctx, &output, &hashes, FALSE, NULL, 0))
|
||||
g_error ("Crash reporter dumper exited due to fatal error.");
|
||||
if (mono_dump_start ()) {
|
||||
// Process was killed from outside since crash reporting wasn't running yet.
|
||||
mono_handle_native_crash ("SIGTERM", &mctx, NULL);
|
||||
} else {
|
||||
// Crash reporting already running and we got a second SIGTERM from as part of thread-summarizing
|
||||
if (!mono_threads_summarize_execute (&mctx, &output, &hashes, FALSE, NULL, 0))
|
||||
g_error ("Crash reporter dumper exited due to fatal error.");
|
||||
}
|
||||
#endif
|
||||
|
||||
mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
|
||||
@ -1060,7 +1069,6 @@ dump_native_stacktrace (const char *signal, MonoContext *mctx)
|
||||
g_async_safe_printf("\nThe MERP upload step has succeeded.\n");
|
||||
mono_summarize_timeline_phase_log (MonoSummaryDone);
|
||||
}
|
||||
|
||||
mono_summarize_toggle_assertions (FALSE);
|
||||
} else {
|
||||
g_async_safe_printf("\nMerp dump step not run, no dump created.\n");
|
||||
@ -1125,7 +1133,6 @@ void
|
||||
mono_dump_native_crash_info (const char *signal, MonoContext *mctx, MONO_SIG_HANDLER_INFO_TYPE *info)
|
||||
{
|
||||
dump_native_stacktrace (signal, mctx);
|
||||
|
||||
dump_memory_around_ip (mctx);
|
||||
}
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
92b47e1786fd50b90c2674b0737ae4562363279a
|
||||
5c4de1ddfb52598a3996bb12514452a6428759da
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/8946e49"
|
||||
#define FULL_VERSION "explicit/444a9a3"
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -8,11 +8,13 @@
|
||||
* (C) 2018 Microsoft, Inc.
|
||||
*
|
||||
*/
|
||||
#ifndef DISABLE_CRASH_REPORTING
|
||||
|
||||
#include <config.h>
|
||||
#include <glib.h>
|
||||
#include <mono/utils/mono-state.h>
|
||||
#include <mono/utils/atomic.h>
|
||||
|
||||
#ifndef DISABLE_CRASH_REPORTING
|
||||
|
||||
#include <mono/utils/mono-threads-coop.h>
|
||||
#include <mono/metadata/object-internals.h>
|
||||
#include <mono/metadata/mono-config-dirs.h>
|
||||
@ -1140,3 +1142,17 @@ mono_crash_dump (const char *jsonFile, MonoStackHash *hashes)
|
||||
}
|
||||
|
||||
#endif // DISABLE_CRASH_REPORTING
|
||||
|
||||
static volatile int32_t dump_status;
|
||||
|
||||
gboolean
|
||||
mono_dump_start (void)
|
||||
{
|
||||
return (mono_atomic_xchg_i32(&dump_status, 1) == 0); // return true if we started the dump
|
||||
}
|
||||
|
||||
gboolean
|
||||
mono_dump_complete (void)
|
||||
{
|
||||
return (mono_atomic_xchg_i32(&dump_status, 0) == 1); // return true if we completed the dump
|
||||
}
|
||||
|
||||
@ -118,4 +118,12 @@ void
|
||||
mono_state_free_mem (MonoStateMem *mem);
|
||||
|
||||
#endif // DISABLE_CRASH_REPORTING
|
||||
|
||||
// Dump context functions (enter/leave)
|
||||
|
||||
gboolean
|
||||
mono_dump_start (void);
|
||||
gboolean
|
||||
mono_dump_complete (void);
|
||||
|
||||
#endif // MONO_UTILS_NATIVE_STATE
|
||||
|
||||
@ -525,8 +525,8 @@ 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."
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
2fd05504bf008c727f0ff264c03fc2fa399badc9
|
||||
a103317a253b30c31bfbc68ba73a535aa3298ef5
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6bea5dc1b96942da8234d7bd9e7fc7b2f5a6148b
|
||||
61cedbc0051741bcdb85436e2576252d7bf33f17
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3f0fa10262e323b9bedd28e284e616e44ea918f4
|
||||
5cc5caeebb23991a98d5c6c7b08fac1d0ae7df2a
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.144\n"
|
||||
"Project-Id-Version: mono 6.6.0.145\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-10-25 08:26+0000\n"
|
||||
"POT-Creation-Date: 2019-10-27 08:30+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
9b7ee05fd4418baf3797f4dbe4fdc7303930ba3a
|
||||
5a13d946b2fa278a1f0179bc91cb5d8ddc8e2b31
|
||||
Loading…
x
Reference in New Issue
Block a user