Imported Upstream version 6.6.0.113

Former-commit-id: d52971a4a0442dd412cbb7f405a7a02ac793599e
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-10-06 08:59:44 +00:00
parent 76890153df
commit f3eef79423
49 changed files with 50 additions and 64 deletions

View File

@ -158,9 +158,6 @@
/* Enable cooperative stop-the-world garbage collection. */ /* Enable cooperative stop-the-world garbage collection. */
#undef ENABLE_COOP_SUSPEND #undef ENABLE_COOP_SUSPEND
/* Enable copy_stack_data feature for hybrid/cooperative suspend scenarios */
#undef ENABLE_COPY_STACK_DATA
/* Enable DTrace probes */ /* Enable DTrace probes */
#undef ENABLE_DTRACE #undef ENABLE_DTRACE

View File

@ -1 +1 @@
1892799cec7ada77bf0412de6037695b26342760 3cc02169c054617cd6b1f0fad3a8eb60bbb47218

View File

@ -1 +1 @@
70613a61062dae31e2ddc737e6095df647b9222a 5d8304f4a9fa24cc797f54b95bbbb703509708b3

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "6.6.0.110"; public const string MonoVersion = "6.6.0.113";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
caf320d7af68ab2292a74eaebc24abaaa73bc823 7a11f98fc0b6a587fa8e5762e622eba738b5ae1c

View File

@ -1 +1 @@
6e8d50c11337ba8f959ec423db910c0b07ab10e8 51e884cbf33cf04ca98e05e90f25524e7ce27c2b

View File

@ -1 +1 @@
976719b6445a59f2bf752893a8f522a8bb79acd7 99b68b52b64a17514c5ed2bb24ca2d8d6fed099e

View File

@ -1 +1 @@
88a1a82e64083f00bace15e5a311c0b122c253dd adbecc5da962d6295a44cc85b55b94828f44469f

View File

@ -1 +1 @@
4926d847d735b80ad575ac900921accb700e8903 2237f3ec2c622209d418ea3d48f38a683858ec57

View File

@ -1 +1 @@
40297b60f2bc031edde89c3c6005261256e6af6c 3dc1440481984bdf31458ab7cd881b1d2d31b677

View File

@ -1 +1 @@
21d681f5d1db13f93644fc3c267c0835414019af 8e951f5812cdfae80b289362a0df13b9e55871ea

View File

@ -1 +1 @@
caf320d7af68ab2292a74eaebc24abaaa73bc823 7a11f98fc0b6a587fa8e5762e622eba738b5ae1c

View File

@ -1 +1 @@
6e8d50c11337ba8f959ec423db910c0b07ab10e8 51e884cbf33cf04ca98e05e90f25524e7ce27c2b

View File

@ -1 +1 @@
976719b6445a59f2bf752893a8f522a8bb79acd7 99b68b52b64a17514c5ed2bb24ca2d8d6fed099e

View File

@ -1 +1 @@
88a1a82e64083f00bace15e5a311c0b122c253dd adbecc5da962d6295a44cc85b55b94828f44469f

View File

@ -1 +1 @@
4926d847d735b80ad575ac900921accb700e8903 2237f3ec2c622209d418ea3d48f38a683858ec57

View File

@ -1 +1 @@
40297b60f2bc031edde89c3c6005261256e6af6c 3dc1440481984bdf31458ab7cd881b1d2d31b677

View File

@ -1 +1 @@
22403c79d060f70ba34580a710c36d91f3d7c34c 5190b60f23762614eb18560f302748e925f1b4c5

View File

@ -1 +1 @@
21d681f5d1db13f93644fc3c267c0835414019af 8e951f5812cdfae80b289362a0df13b9e55871ea

View File

@ -1 +1 @@
caf320d7af68ab2292a74eaebc24abaaa73bc823 7a11f98fc0b6a587fa8e5762e622eba738b5ae1c

View File

@ -1 +1 @@
6e8d50c11337ba8f959ec423db910c0b07ab10e8 51e884cbf33cf04ca98e05e90f25524e7ce27c2b

View File

@ -1 +1 @@
976719b6445a59f2bf752893a8f522a8bb79acd7 99b68b52b64a17514c5ed2bb24ca2d8d6fed099e

View File

@ -1 +1 @@
88a1a82e64083f00bace15e5a311c0b122c253dd adbecc5da962d6295a44cc85b55b94828f44469f

View File

@ -1 +1 @@
4926d847d735b80ad575ac900921accb700e8903 2237f3ec2c622209d418ea3d48f38a683858ec57

View File

@ -1 +1 @@
40297b60f2bc031edde89c3c6005261256e6af6c 3dc1440481984bdf31458ab7cd881b1d2d31b677

View File

@ -1 +1 @@
22403c79d060f70ba34580a710c36d91f3d7c34c 5190b60f23762614eb18560f302748e925f1b4c5

View File

@ -1 +1 @@
21d681f5d1db13f93644fc3c267c0835414019af 8e951f5812cdfae80b289362a0df13b9e55871ea

View File

@ -1 +1 @@
caf320d7af68ab2292a74eaebc24abaaa73bc823 7a11f98fc0b6a587fa8e5762e622eba738b5ae1c

View File

@ -1 +1 @@
6e8d50c11337ba8f959ec423db910c0b07ab10e8 51e884cbf33cf04ca98e05e90f25524e7ce27c2b

View File

@ -1 +1 @@
2898bed814b77dafab7c2592e8971fb8b05c0e8e e78ba52583900eaaa05bc114bf21d23dd929b2b6

View File

@ -1 +1 @@
88a1a82e64083f00bace15e5a311c0b122c253dd adbecc5da962d6295a44cc85b55b94828f44469f

View File

@ -1 +1 @@
4926d847d735b80ad575ac900921accb700e8903 2237f3ec2c622209d418ea3d48f38a683858ec57

View File

@ -1 +1 @@
40297b60f2bc031edde89c3c6005261256e6af6c 3dc1440481984bdf31458ab7cd881b1d2d31b677

View File

@ -1 +1 @@
22403c79d060f70ba34580a710c36d91f3d7c34c 5190b60f23762614eb18560f302748e925f1b4c5

View File

@ -1 +1 @@
7c4a107bea57f9283f659879f057d341afe17f6f 36d1eadc0c38521442c8f591495e941e5345a3b6

View File

@ -1 +1 @@
709f740df70ec42f34c663fe62b52fd6bcc7831f a3d7bdfd75812369831f8d78ffcc8ad3a0643367

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/9e6def1" #define FULL_VERSION "explicit/54a33be"

View File

@ -1496,10 +1496,10 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @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: @CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
clean: clean-am clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

View File

@ -34,12 +34,6 @@
#include <mono/utils/mach-support.h> #include <mono/utils/mach-support.h>
#endif #endif
/* On platforms that doesn't have full context support (or doesn't do conservative stack scan), use copy stack data */
/* when entering safe/unsafe GC regions. For platforms with full context support (doing conservative stack scan), */
/* there is already logic in place to take context before getting in a state where thread could be conservative */
/* scanned by GC. Avoiding doing additional stack copy will increse performance when entering safe/unsafe regions */
/* when running in hybrid/cooperative supspend mode. */
#if defined (ENABLE_COPY_STACK_DATA)
#ifdef _MSC_VER #ifdef _MSC_VER
// __builtin_unwind_init not available under MSVC but equivalent implementation is done using // __builtin_unwind_init not available under MSVC but equivalent implementation is done using
// copy_stack_data_internal_win32_wrapper. // copy_stack_data_internal_win32_wrapper.
@ -50,9 +44,6 @@
#else #else
#define SAVE_REGS_ON_STACK __builtin_unwind_init (); #define SAVE_REGS_ON_STACK __builtin_unwind_init ();
#endif #endif
#else
#define SAVE_REGS_ON_STACK do {} while (0)
#endif
volatile size_t mono_polling_required; volatile size_t mono_polling_required;
@ -207,7 +198,6 @@ copy_stack_data_internal (MonoThreadInfo *info, MonoStackData *stackdata_begin,
state->gc_stackdata_size = stackdata_size; state->gc_stackdata_size = stackdata_size;
} }
#if defined (ENABLE_COPY_STACK_DATA)
#ifdef _MSC_VER #ifdef _MSC_VER
typedef void (*CopyStackDataFunc)(MonoThreadInfo *, MonoStackData *, gconstpointer, gconstpointer); typedef void (*CopyStackDataFunc)(MonoThreadInfo *, MonoStackData *, gconstpointer, gconstpointer);
@ -258,12 +248,6 @@ copy_stack_data (MonoThreadInfo *info, MonoStackData *stackdata_begin)
copy_stack_data_internal (info, stackdata_begin, NULL, NULL); copy_stack_data_internal (info, stackdata_begin, NULL, NULL);
} }
#endif #endif
#else
static void
copy_stack_data (MonoThreadInfo *info, MonoStackData *stackdata_begin)
{
}
#endif
static gpointer static gpointer
mono_threads_enter_gc_safe_region_unbalanced_with_info (MonoThreadInfo *info, MonoStackData *stackdata); mono_threads_enter_gc_safe_region_unbalanced_with_info (MonoThreadInfo *info, MonoStackData *stackdata);
@ -326,6 +310,11 @@ mono_threads_enter_gc_safe_region_unbalanced_with_info (MonoThreadInfo *info, Mo
check_info (info, "enter", "safe", function_name); check_info (info, "enter", "safe", function_name);
// NOTE, copy_stack_data needs to be done. One problem it solves is optimization taking place between stackdata snapshot and
// thread_state_init, storing changed register(s) on stack and if those register(s) include managed references
// (that are not previously stored anywhere on the stack), then GC won't detect that reference(s). Storing the stack
// and registers into a separate location makes sure we still see any registers temporary stored on stack due to optimizations
// done between stackdata snapshot and thread_state_init.
copy_stack_data (info, stackdata); copy_stack_data (info, stackdata);
retry: retry:

View File

@ -525,8 +525,8 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@ENABLE_MSVC_FALSE@clean-local:
@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@install-exec-local:
@ENABLE_MSVC_FALSE@clean-local:
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am

Binary file not shown.

View File

@ -1 +1 @@
09fd221bc0ec10d0419aeb8d117cd3bd8fceb7f4 5bc19ae48f6e58ad739f4d19289b4efff5175096

Binary file not shown.

View File

@ -1 +1 @@
2124fa078b1871a7613be97ca0e5c7c59753be38 095255e4a7c38cef2bbcf5de6cd954b8ff24dc34

Binary file not shown.

View File

@ -1 +1 @@
4eba3ac18722dedf93f574c649ac970e80a23f29 b4737d82229c5f51b2f1cc667e12898ed00b5b92

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.6.0.110\n" "Project-Id-Version: mono 6.6.0.113\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-10-05 08:30+0000\n" "POT-Creation-Date: 2019-10-06 08:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
95f1b4966f8c63c3290557f273f7656bb72a4ab4 d8fd788eb1c90d957137a9baaf75639244df586b