mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 5e0c57c29d2ea67d84c6d64c53ff577ee3fe5e7d
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-12-20 09:14:22 +00:00
commit bf253ec163
54 changed files with 102 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
8ebc8326f0876923619de5e491b3e62664479d18
2ce6c2131f7b8b3079c900084af3240c24f86340

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
ee891702d74552bf93cab3258e51f559981be94e
c0e743df5fbb47a5fe35a704f8e79be992a3eadc

2
mcs/build/common/Consts.cs
View File

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

9
mcs/class/corlib/Test/System.Reflection/ParameterInfoTest.cs
View File

@ -506,5 +506,14 @@ namespace MonoTests.System.Reflection
Assert.AreEqual (expected, actual, "#1");
}
[Test]
public void ReturnParameter_IsDefined_False ()
{
Type type = typeof (object);
MethodInfo method = type.GetMethod ("ToString");
ParameterInfo paramInfo = method.ReturnParameter;
Assert.IsFalse (paramInfo.IsDefined (typeof (Attribute)));
}
}
}

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
95acc042739943bbd3647602cba9333708296d2a
ec1b95ed84e41497894ff47af284d09441fe2b9d

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
0bb1a2c71384164b93825b44667cf43cd7514002
da93afc853249356333970bf2e895a79a4396aa5

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
725c090642989743bad4eec52fd95b35e3b6997d
87756e5e0786babce29f2252713def5f5097f608

BIN
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
cf9a42775b0d1659120c13af9cbbd7e707515320
c1868137ecbfd58a439cb2869f9a49d51ac9c2ae

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
6c29afb83173af842fee496f1a22db5c53d143b8
4f811e6e585a4688a3d06c49fcf3c80bd71530e2

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
d1616fed145503cb7e440209f90de14b222e0521
57d5497782de74426d145cc380ba1a72ca4c9da2

2
mcs/class/lib/monolite-linux/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
371b9785e82b18a1731f250d5eacaa3d1975eada
b7be922d9ee313758f015735c542889ec22647c4

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
95acc042739943bbd3647602cba9333708296d2a
ec1b95ed84e41497894ff47af284d09441fe2b9d

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
0bb1a2c71384164b93825b44667cf43cd7514002
da93afc853249356333970bf2e895a79a4396aa5

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
725c090642989743bad4eec52fd95b35e3b6997d
87756e5e0786babce29f2252713def5f5097f608

BIN
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
cf9a42775b0d1659120c13af9cbbd7e707515320
c1868137ecbfd58a439cb2869f9a49d51ac9c2ae

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
6c29afb83173af842fee496f1a22db5c53d143b8
4f811e6e585a4688a3d06c49fcf3c80bd71530e2

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
d1616fed145503cb7e440209f90de14b222e0521
57d5497782de74426d145cc380ba1a72ca4c9da2

2
mcs/class/lib/monolite-macos/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
371b9785e82b18a1731f250d5eacaa3d1975eada
b7be922d9ee313758f015735c542889ec22647c4

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
95acc042739943bbd3647602cba9333708296d2a
ec1b95ed84e41497894ff47af284d09441fe2b9d

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
0bb1a2c71384164b93825b44667cf43cd7514002
da93afc853249356333970bf2e895a79a4396aa5

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
725c090642989743bad4eec52fd95b35e3b6997d
87756e5e0786babce29f2252713def5f5097f608

BIN
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
cf9a42775b0d1659120c13af9cbbd7e707515320
c1868137ecbfd58a439cb2869f9a49d51ac9c2ae

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
6c29afb83173af842fee496f1a22db5c53d143b8
4f811e6e585a4688a3d06c49fcf3c80bd71530e2

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
d1616fed145503cb7e440209f90de14b222e0521
57d5497782de74426d145cc380ba1a72ca4c9da2

2
mcs/class/lib/monolite-unix/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
371b9785e82b18a1731f250d5eacaa3d1975eada
b7be922d9ee313758f015735c542889ec22647c4

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
95acc042739943bbd3647602cba9333708296d2a
ec1b95ed84e41497894ff47af284d09441fe2b9d

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
0bb1a2c71384164b93825b44667cf43cd7514002
da93afc853249356333970bf2e895a79a4396aa5

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
725c090642989743bad4eec52fd95b35e3b6997d
87756e5e0786babce29f2252713def5f5097f608

BIN
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
cf9a42775b0d1659120c13af9cbbd7e707515320
c1868137ecbfd58a439cb2869f9a49d51ac9c2ae

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
6c29afb83173af842fee496f1a22db5c53d143b8
4f811e6e585a4688a3d06c49fcf3c80bd71530e2

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
d1616fed145503cb7e440209f90de14b222e0521
57d5497782de74426d145cc380ba1a72ca4c9da2

2
mcs/class/lib/monolite-win32/F602B559-7639-49B6-97EE-C433CE7A56F2/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
371b9785e82b18a1731f250d5eacaa3d1975eada
b7be922d9ee313758f015735c542889ec22647c4

5
mcs/class/referencesource/mscorlib/system/attribute.cs
View File

@ -106,7 +106,10 @@ namespace System {
var method = ((MethodInfo) member).GetBaseMethod ();
while (true) {
var param = method.GetParametersInternal () [parameter.Position];
var parameters = method.GetParametersInternal ();
if (parameters?.Length == 0 || parameter.Position < 0)
return false;
var param = parameters [parameter.Position];
if (param.IsDefined (attributeType, false))
return true;

2
mono/mini/mini-generic-sharing.c.REMOVED.git-id
View File

@ -1 +1 @@
609a53a4d5b40362f7fe39ab2f449030d2736aea
57e08ffa65f3e577dcb32e486d70450d0293ae1b

40
mono/mini/mini-posix.c
View File

@ -871,44 +871,6 @@ mono_runtime_setup_stat_profiler (void)
#endif /* defined(HOST_WATCHOS) */
#ifndef MONO_CROSS_COMPILE
static gchar
conv_ascii_char (gchar s)
{
if (s < 0x20)
return '.';
if (s > 0x7e)
return '.';
return s;
}
static void
xxd_mem (gpointer d, int len)
{
guint8 *data = (guint8 *) d;
for (int off = 0; off < len; off += 0x10) {
gchar *line = g_strdup_printf ("%p ", data + off);
for (int i = 0; i < 0x10; i++) {
if ((i + off) >= len)
line = g_strdup_printf ("%s ", line);
else
line = g_strdup_printf ("%s%02x ", line, data [off + i]);
}
line = g_strdup_printf ("%s ", line);
for (int i = 0; i < 0x10; i++) {
if ((i + off) >= len)
line = g_strdup_printf ("%s ", line);
else
line = g_strdup_printf ("%s%c", line, conv_ascii_char (data [off + i]));
}
mono_runtime_printf_err ("%s", line);
}
}
static void
dump_memory_around_ip (void *ctx)
{
@ -918,7 +880,7 @@ dump_memory_around_ip (void *ctx)
gpointer native_ip = MONO_CONTEXT_GET_IP (&mctx);
if (native_ip) {
mono_runtime_printf_err ("Memory around native instruction pointer (%p):", native_ip);
xxd_mem (((guint8 *) native_ip) - 0x10, 0x40);
mono_dump_mem (((guint8 *) native_ip) - 0x10, 0x40);
} else {
mono_runtime_printf_err ("instruction pointer is NULL, skip dumping");
}

2
mono/mini/mini-runtime.c.REMOVED.git-id
View File

@ -1 +1 @@
4ffa27c9063cdf3e0d77896d2c842852e9f0c50a
33fcb38dbf98e33686022e85ad503d8103dfe9a4

2
mono/mini/mini.h.REMOVED.git-id
View File

@ -1 +1 @@
971c91d40ee91dced84e3d74a60966636b8545ee
a468afcf5e9b9a7265eaf48d863469c31c4500e8

7
mono/mini/unwind.c
View File

@ -14,6 +14,7 @@
#include <mono/utils/mono-counters.h>
#include <mono/utils/freebsd-dwarf.h>
#include <mono/utils/hazard-pointer.h>
#include <mono/utils/mono-logger-internals.h>
#include <mono/metadata/threads-types.h>
#include <mono/metadata/mono-endian.h>
@ -637,7 +638,11 @@ mono_unwind_frame (guint8 *unwind_info, guint32 unwind_info_len,
if (save_locations)
memset (save_locations, 0, save_locations_len * sizeof (mgreg_t*));
g_assert (cfa_reg != -1);
if (cfa_reg == -1) {
mono_runtime_printf_err ("Unset cfa_reg in method %s. Memory around ip (%p):", mono_get_method_from_ip (ip), ip);
mono_dump_mem (ip - 0x10, 0x40);
g_assert_not_reached ();
}
cfa_val = (guint8*)regs [mono_dwarf_reg_to_hw_reg (cfa_reg)] + cfa_offset;
for (hwreg = 0; hwreg < NUM_HW_REGS; ++hwreg) {
if (reg_saved [hwreg] && locations [hwreg].loc_type == LOC_OFFSET) {

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/f919fb5"
#define FULL_VERSION "explicit/3f799cc"

2
mono/utils/mono-logger-internals.h
View File

@ -161,6 +161,8 @@ void mono_log_write_recorder (const char *log_domain, GLogLevelFlags level, mono
void mono_log_close_recorder (void);
void mono_log_dump_recorder (void);
void mono_dump_mem (gpointer d, int len);
G_END_DECLS
#endif /* __MONO_LOGGER_INTERNAL_H__ */

39
mono/utils/mono-logger.c
View File

@ -527,3 +527,42 @@ mono_trace_set_printerr_handler (MonoPrintCallback callback)
printerr_callback = callback;
g_set_printerr_handler (printerr_handler);
}
static gchar
conv_ascii_char (gchar s)
{
if (s < 0x20)
return '.';
if (s > 0x7e)
return '.';
return s;
}
/* No memfree because only called during crash */
void
mono_dump_mem (gpointer d, int len)
{
guint8 *data = (guint8 *) d;
for (int off = 0; off < len; off += 0x10) {
char *line = g_strdup_printf ("%p ", data + off);
for (int i = 0; i < 0x10; i++) {
if ((i + off) >= len)
line = g_strdup_printf ("%s ", line);
else
line = g_strdup_printf ("%s%02x ", line, data [off + i]);
}
line = g_strdup_printf ("%s ", line);
for (int i = 0; i < 0x10; i++) {
if ((i + off) >= len)
line = g_strdup_printf ("%s ", line);
else
line = g_strdup_printf ("%s%c", line, conv_ascii_char (data [off + i]));
}
mono_runtime_printf_err ("%s", line);
}
}

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
772d8eeb833fa41f10b447d12eebc37aa3e3323f
723f596707c90e1a13902ea845a24fdea7f705e7

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
dc0aaf04951d38b16917bc894246bff93ce21e26
68b250d0fbd9f9d5507dce0f0bfc52eec5e93bc8

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
793443e70a2c35052b81927873f7d1101a142d68
a1eac3d238780b5d5ba2fc54c8f0485f594c8c40

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.18.0.219\n"
"Project-Id-Version: mono 5.18.0.223\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-12-05 08:06+0000\n"
"POT-Creation-Date: 2018-12-20 08:52+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
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
954bc8d2cf80649e0b4953cec68a5ac972a4a221
b5d5713efa0d508accb48fe56ee03d5e01155465