Imported Upstream version 5.8.0.103
Former-commit-id: 34aae23f3ddb4e722881b1a99642b2c6b7a7abb6
This commit is contained in:
parent
6123a772ed
commit
5fb0d61fc6
@ -1 +1 @@
|
||||
37c1b000c4419715dad5a8f78a060364b72479dd
|
||||
500f87548b7d7fc19932796f10f77b860532830c
|
@ -1 +1 @@
|
||||
0fcbd9917a47e8f359dbdcbd676abae3b61dc4e6
|
||||
c37b093c9632205f4c8961496754329b55b87cc6
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.8.0.88";
|
||||
public const string MonoVersion = "5.8.0.103";
|
||||
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 @@
|
||||
c460af5e308e5dcd4ce52fe1f96343a85c8e8ed4
|
||||
60a68c5ab5b1c095b8a1a23761f45ff75b1bf9db
|
@ -1 +1 @@
|
||||
ad4bf3fe7092b8a49e8a4b5272e6bd2e1a3e754d
|
||||
4d9a8c11d37509f6374d96c87a8faabbd90eded0
|
@ -1 +1 @@
|
||||
22ebdf4fb26c210ef61597b5c98e36ee6738c566
|
||||
c2e760a7bb7d670d2858a4a763c68a6a144fe3d5
|
@ -1 +1 @@
|
||||
b61e7c78b678a0e29b371066324c40cc54d8290a
|
||||
5faa2a5296ce8e5717873b82b8cc94f7f4a0bf77
|
@ -1 +1 @@
|
||||
f8c250e2523d70ab4cc7212751f123f38f6222f0
|
||||
db80c37286faf91a62bd4868e0a57bbff4bbf5dd
|
@ -1 +1 @@
|
||||
3c229dd1cd687ae6aaaf02c99caf42f48272d2e0
|
||||
ff2d583abecb15a4159513f02909e9644b50845a
|
@ -1 +1 @@
|
||||
d1b3960c2e53dd40209ef617d0359bd6facb3459
|
||||
97d5ef8a4d495313de00e7f5affb9eec789f33f8
|
@ -1 +1 @@
|
||||
1e337c3129e2f8920ae3074e27e4cad8dfa80f4d
|
||||
44d62229b5c4ec1cc50052f9edac17abc069be87
|
@ -1 +1 @@
|
||||
5cd79b8575f26f15deeeaaf7847dde1920ccff81
|
||||
3231f9c9fb037e65dc5b487d8e045e6839fdb40c
|
@ -1 +1 @@
|
||||
bdb13b5a912c910e389cf8a71503467473bf862f
|
||||
c699d7350bbed35bd074ad7ec966882d4a8222a5
|
@ -1 +1 @@
|
||||
8d2205d67d86470adbe0102be00e862070d907fc
|
||||
fe41a9a3652738c39a0c71f9799ddb76564dacca
|
@ -1 +1 @@
|
||||
f12c42672958d7d4aec3ad6c7039f5690b3aaa9a
|
||||
1d4d16c4202a3dd4e1bd6aaafbf074847bedebc5
|
@ -1 +1 @@
|
||||
2fbad1b568c155d4eb29e43beaf50a560e56004b
|
||||
37b5f7e483f84610a3d92bf44c08795ec777f872
|
@ -1 +1 @@
|
||||
a5322f57a2f00e7de78ef60d35784b0d7edfe0e6
|
||||
840349a1da3cab83ed2416e0fe3cf80aa6fc9243
|
@ -1 +1 @@
|
||||
fb51678822ba19283fa5d4fe415aa99a924724a3
|
||||
e3b737b021aeb062d04a0ead6c7dd16c06983a17
|
@ -1 +1 @@
|
||||
b9468862e00b5ce32a69725e11976e6bcb1bec36
|
||||
9307bdb8a4bd3c7dc23adbb5bae334c5c0043388
|
@ -1 +1 @@
|
||||
798e96081eac184a05402f0359ea68c921c752ec
|
||||
a63779d1104e813ef407fb99a6fdcb40a78c00a5
|
@ -1 +1 @@
|
||||
60227503e13c4a7575b30e0fe10cc0d769b42876
|
||||
9a07ce5baaefc0d4c983b00300033fc0a72c4fdf
|
@ -1 +1 @@
|
||||
6e6368f45a69b8f488106fa01ffde9cd8db25369
|
||||
b6411a56f6d6143a03f07e9a4bcf47cff8ea1fb1
|
@ -1 +1 @@
|
||||
dc9865b21a260efca86f1c6fdefcfb697d05f93b
|
||||
0242bb183e348d3a4093f10229703bf152b00efd
|
@ -1 +1 @@
|
||||
8ad7c260dca99201c101cfbbf2cdf206e2f453c5
|
||||
bcd19f07e37fdf9b2936e2f211cf05d2948682fc
|
@ -50,7 +50,7 @@ net_4_5_dirs := \
|
||||
linker-analyzer
|
||||
|
||||
build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator resx2sr linker
|
||||
monodroid_tools_SUBDIRS = cil-strip mkbundle mdoc mono-symbolicate
|
||||
monodroid_tools_SUBDIRS = cil-strip linker-analyzer mkbundle mdoc mono-symbolicate
|
||||
net_4_5_SUBDIRS = gacutil
|
||||
net_4_x_SUBDIRS = gacutil
|
||||
net_4_5_PARALLEL_SUBDIRS = $(net_4_5_dirs)
|
||||
|
@ -1 +1 @@
|
||||
3198e4fbc46804c871794fa1bc64a82aac2bfeed
|
||||
f47dddb8a66a8e503efc514a62fe40f63681abc4
|
@ -1905,6 +1905,10 @@ get_method_constrained (MonoImage *image, MonoMethod *method, MonoClass *constra
|
||||
g_assert (vtable_slot >= 0);
|
||||
|
||||
MonoMethod *res = mono_class_get_vtable_entry (constrained_class, vtable_slot);
|
||||
if (res == NULL && mono_class_is_abstract (constrained_class) ) {
|
||||
/* Constraining class is abstract, there may not be a refined method. */
|
||||
return method;
|
||||
}
|
||||
g_assert (res != NULL);
|
||||
if (inflated_generic_method) {
|
||||
g_assert (res->is_generic);
|
||||
|
@ -1 +1 @@
|
||||
43c8a61d9ab8159f75591149aa572c470dc52227
|
||||
ee50106c4400fbe6db4bb4eb77b468378808a115
|
@ -1 +1 @@
|
||||
6a32c135e9212ab9d7a66157990c5e67740fe8be
|
||||
fde1ef74356c9a973267aac779c7f1da50214fa9
|
@ -1 +1 @@
|
||||
7330d1cd30a976205ad29f6ae985472c6a8b28ad
|
||||
869030a48815605bf8a9e74965b03ca1a65e54cc
|
@ -1 +1 @@
|
||||
c821b7ac59ac6773746b6d5a79da93c03e0543cf
|
||||
d4a876c2cf6a8a19d59f016b5764f806e9aac3c2
|
@ -1 +1 @@
|
||||
54e8c3580bf1ac6270c750908ad59a82b1165102
|
||||
d30f0570533a137038bda04e9797e5cb0fe957d5
|
@ -1 +1 @@
|
||||
43d0e17babbd6c4d5fa6509eac2eb389aade1999
|
||||
2b23ab48cc34da605d2f53efb80eb8364c1effa3
|
@ -1 +1 @@
|
||||
1d2863ddde4cd9118013e3daf333c8934ccbb9c5
|
||||
f88d5536249ac70044c3c975a6e9acd50696a4e2
|
@ -1 +1 @@
|
||||
6192f26b9cf042e653ad287c859bb881aafebca0
|
||||
8feb87f83dd818bf6e21bfeb0632563a0ebbc19c
|
@ -316,7 +316,7 @@ mono_get_throw_exception_addr (void)
|
||||
return &throw_exception_func;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
static gboolean
|
||||
is_address_protected (MonoJitInfo *ji, MonoJitExceptionInfo *ei, gpointer ip)
|
||||
{
|
||||
MonoTryBlockHoleTableJitInfo *table;
|
||||
@ -337,7 +337,7 @@ is_address_protected (MonoJitInfo *ji, MonoJitExceptionInfo *ei, gpointer ip)
|
||||
|
||||
for (i = 0; i < table->num_holes; ++i) {
|
||||
MonoTryBlockHoleJitInfo *hole = &table->holes [i];
|
||||
if (ji->clauses [hole->clause].try_offset == ji->clauses [clause].try_offset && hole->offset <= offset && hole->offset + hole->length > offset)
|
||||
if (hole->clause == clause && hole->offset <= offset && hole->offset + hole->length > offset)
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
@ -2034,7 +2034,7 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
|
||||
} else {
|
||||
free_stack = 0xffffff;
|
||||
}
|
||||
|
||||
|
||||
for (i = clause_index_start; i < ji->num_clauses; i++) {
|
||||
MonoJitExceptionInfo *ei = &ji->clauses [i];
|
||||
gboolean filtered = FALSE;
|
||||
@ -2155,6 +2155,11 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu
|
||||
#endif
|
||||
} else {
|
||||
MONO_CONTEXT_SET_IP (ctx, ei->handler_start);
|
||||
/*
|
||||
* When the exception is thrown in async fashion, we can have the stack pointer
|
||||
* unaligned. Make sure we resume to the catch handler with an aligned stack.
|
||||
*/
|
||||
MONO_CONTEXT_SET_SP (ctx, (mgreg_t)MONO_CONTEXT_GET_SP (ctx) & ~(MONO_ARCH_FRAME_ALIGNMENT - 1));
|
||||
}
|
||||
mono_set_lmf (lmf);
|
||||
#ifndef DISABLE_PERFCOUNTERS
|
||||
|
@ -1 +1 @@
|
||||
0a489649c86dc3eae078a1a0342647d73ca8a5f8
|
||||
f2e7ee609ba2c1b0b426748470d412ff759fb715
|
@ -1 +1 @@
|
||||
4ba20cc2257e31ff9ad4e154ca7267b2b939d124
|
||||
b90f149bc295ab90f7885e5d41939b9713932ed5
|
@ -1 +1 @@
|
||||
584813cc4db9caa812d9b5f4c9d75382cb6358f0
|
||||
50a2dda4bf50f617fbe5661a74b28ebaae8a26a6
|
@ -1 +1 @@
|
||||
75868b976111366640a3974af502671fac0d6b91
|
||||
cc6718eec242095edd099211c287517a88540881
|
@ -1 +1 @@
|
||||
f6b61bae8cc000152eec0fdd5c0676933663cdf2
|
||||
da39871c09d923970e4a235b3d90a205faabbe36
|
@ -1 +1 @@
|
||||
af04f0bb7966ac94eb40a7e290d3ca0d2b072549
|
||||
a1dd5732aaad66508052f9c267cceb9ebab9f62f
|
@ -1 +1 @@
|
||||
f8d052627cd72c45b10e5563471039bbb43eb0b9
|
||||
947c3ee509153002fd5182a31b5280079a914b0d
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/ddeba6e"
|
||||
#define FULL_VERSION "explicit/1359c52"
|
||||
|
@ -521,7 +521,8 @@ TESTS_CS_SRC= \
|
||||
bug-58782-plain-throw.cs \
|
||||
bug-58782-capture-and-throw.cs \
|
||||
recursive-struct-arrays.cs \
|
||||
bug-59281.cs
|
||||
bug-59281.cs \
|
||||
threads-leak.cs
|
||||
|
||||
if AMD64
|
||||
TESTS_CS_SRC += async-exc-compilation.cs finally_guard.cs finally_block_ending_in_dead_bb.cs
|
||||
|
@ -1 +1 @@
|
||||
f0eb94c705ca503be0b3c1061a43fb3b5375f86d
|
||||
404251d42bc2c933aabcf9863840698ca64d1ac2
|
45
mono/tests/threads-leak.cs
Normal file
45
mono/tests/threads-leak.cs
Normal file
@ -0,0 +1,45 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
class Driver
|
||||
{
|
||||
static ManualResetEvent mre = new ManualResetEvent (false);
|
||||
|
||||
class MyClassInThread
|
||||
{
|
||||
public int I { get; set; }
|
||||
|
||||
~MyClassInThread()
|
||||
{
|
||||
try {
|
||||
Console.WriteLine($"Finalizer {I}");
|
||||
} catch (NotSupportedException) {
|
||||
}
|
||||
|
||||
mre.Set ();
|
||||
}
|
||||
}
|
||||
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
for (int i = 0; i < 50; ++i) {
|
||||
SpawnThread(i);
|
||||
GC.Collect();
|
||||
GC.Collect();
|
||||
GC.Collect();
|
||||
GC.Collect();
|
||||
GC.WaitForPendingFinalizers();
|
||||
Console.WriteLine($"Loop {i}");
|
||||
}
|
||||
|
||||
if (!mre.WaitOne(0))
|
||||
Environment.Exit (1);
|
||||
}
|
||||
|
||||
static void SpawnThread(int i)
|
||||
{
|
||||
var th = new Thread(_ => {}) { IsBackground = true, };
|
||||
th.Start(new MyClassInThread { I = i });
|
||||
th.Join();
|
||||
}
|
||||
}
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
f7d105452d59fa04caa1daa4f31bd54cfc8336b9
|
||||
782b3dccbf3045cfc119b732132c40a785cd93ee
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c48bbbd79a8b765a778040bf22761996d0c4cf5c
|
||||
7ab59a2e9dfda7ad5ebdf385a4ffa9022275a04e
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6871f4b9f90c79fa85c98b829074c49bb0b866fa
|
||||
3c588250aa700404a39e59b172ecd00ab4e850a8
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.8.0.88\n"
|
||||
"Project-Id-Version: mono 5.8.0.103\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2017-11-28 18:47+0000\n"
|
||||
"POT-Creation-Date: 2018-01-17 20:04+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 @@
|
||||
981320e79c655319d802828500dfced7d46a8848
|
||||
f3db87beb1598a50cbd128db99ab1c63b3a9e244
|
Loading…
x
Reference in New Issue
Block a user