Merge branch 'upstream'

Former-commit-id: 2f0de22fdf46fa5b3da0348c1903c4825588f4de
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-09-02 08:24:04 +00:00
commit 8ed6e7dc50
42 changed files with 43 additions and 34 deletions

View File

@ -1 +1 @@
4d4ef565049e2cd1fa0bf44be14ae23d425026b8 524ba0e2153f00fd9b26bb62716c5aebe3699e4e

View File

@ -1 +1 @@
9e0a9efcb9f0156b8fa33eba4a59a8ed823bebc7 41418edcfc9fd6d10a220b77dfe877083354010b

View File

@ -34,7 +34,7 @@ static 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 = "5.16.0.135"; public const string MonoVersion = "5.16.0.138";
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 @@
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 9216d3ed8800bcdfdc6a5e463b344517288ad5f5

View File

@ -1 +1 @@
41237ab35261a093d70cfb46a706988944a2fe91 aa04f998874a2d4e0401e1526b9bc27990395dda

View File

@ -1 +1 @@
9dad5a97d4beb66ca299a769b1120d1a8e216baf 28d58bce80aa5b3145529340c21753a015bda1b1

View File

@ -1 +1 @@
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647 e956e1c5bf7cd5513905945fb1e0dbd698d0e9cb

View File

@ -1 +1 @@
6db7ca567c9f0072c556397c50da9169e5058892 ff8f7cfd19f6ae18ae59b7ad302b258cd2fdfd26

View File

@ -1 +1 @@
4b7b0a51812de6a0fb4f6476fa3464b18278f342 3fca1498811010bee896ad86aa1b4129977d120c

View File

@ -1 +1 @@
bf69562e337368809f7b67ed4f50b9ae2d18add3 cdf1d90c98a67e04009c1f9c9216b67cd2677708

View File

@ -1 +1 @@
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 9216d3ed8800bcdfdc6a5e463b344517288ad5f5

View File

@ -1 +1 @@
41237ab35261a093d70cfb46a706988944a2fe91 aa04f998874a2d4e0401e1526b9bc27990395dda

View File

@ -1 +1 @@
9dad5a97d4beb66ca299a769b1120d1a8e216baf 28d58bce80aa5b3145529340c21753a015bda1b1

View File

@ -1 +1 @@
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647 e956e1c5bf7cd5513905945fb1e0dbd698d0e9cb

View File

@ -1 +1 @@
6db7ca567c9f0072c556397c50da9169e5058892 ff8f7cfd19f6ae18ae59b7ad302b258cd2fdfd26

View File

@ -1 +1 @@
4b7b0a51812de6a0fb4f6476fa3464b18278f342 3fca1498811010bee896ad86aa1b4129977d120c

View File

@ -1 +1 @@
bf69562e337368809f7b67ed4f50b9ae2d18add3 cdf1d90c98a67e04009c1f9c9216b67cd2677708

View File

@ -1 +1 @@
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0 9216d3ed8800bcdfdc6a5e463b344517288ad5f5

View File

@ -1 +1 @@
41237ab35261a093d70cfb46a706988944a2fe91 aa04f998874a2d4e0401e1526b9bc27990395dda

View File

@ -1 +1 @@
9dad5a97d4beb66ca299a769b1120d1a8e216baf 28d58bce80aa5b3145529340c21753a015bda1b1

View File

@ -1 +1 @@
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647 e956e1c5bf7cd5513905945fb1e0dbd698d0e9cb

View File

@ -1 +1 @@
6db7ca567c9f0072c556397c50da9169e5058892 ff8f7cfd19f6ae18ae59b7ad302b258cd2fdfd26

View File

@ -1 +1 @@
4b7b0a51812de6a0fb4f6476fa3464b18278f342 3fca1498811010bee896ad86aa1b4129977d120c

View File

@ -1 +1 @@
bf69562e337368809f7b67ed4f50b9ae2d18add3 cdf1d90c98a67e04009c1f9c9216b67cd2677708

View File

@ -13,6 +13,7 @@
#include <mono/metadata/class-internals.h> #include <mono/metadata/class-internals.h>
#include <mono/metadata/threads-types.h> #include <mono/metadata/threads-types.h>
#include <mono/metadata/handle.h> #include <mono/metadata/handle.h>
#include <mono/metadata/abi-details.h>
#include "mono/utils/mono-compiler.h" #include "mono/utils/mono-compiler.h"
#include "mono/utils/mono-error.h" #include "mono/utils/mono-error.h"
#include "mono/utils/mono-error-internals.h" #include "mono/utils/mono-error-internals.h"
@ -135,6 +136,8 @@ struct _MonoString {
mono_unichar2 chars [MONO_ZERO_LEN_ARRAY]; mono_unichar2 chars [MONO_ZERO_LEN_ARRAY];
}; };
#define MONO_SIZEOF_MONO_STRING (MONO_STRUCT_OFFSET (MonoString, chars))
#define mono_object_class(obj) (((MonoObject*)(obj))->vtable->klass) #define mono_object_class(obj) (((MonoObject*)(obj))->vtable->klass)
#define mono_object_domain(obj) (((MonoObject*)(obj))->vtable->domain) #define mono_object_domain(obj) (((MonoObject*)(obj))->vtable->domain)

View File

@ -1 +1 @@
408c5d201edf2695cf70e933d9e77959fd6a1f33 960a260ea505c05f293bd6311205a73eb083e26f

View File

@ -115,7 +115,7 @@ sgen_client_slow_object_get_size (GCVTable vtable, GCObject* o)
* mono_array_length_fast not using the object's vtable. * mono_array_length_fast not using the object's vtable.
*/ */
if (klass == mono_defaults.string_class) { if (klass == mono_defaults.string_class) {
return G_STRUCT_OFFSET (MonoString, chars) + 2 * mono_string_length_fast ((MonoString*) o) + 2; return MONO_SIZEOF_MONO_STRING + 2 * mono_string_length_fast ((MonoString*) o) + 2;
} else if (m_class_get_rank (klass)) { } else if (m_class_get_rank (klass)) {
return sgen_mono_array_size (vtable, (MonoArray*)o, NULL, 0); return sgen_mono_array_size (vtable, (MonoArray*)o, NULL, 0);
} else { } else {

View File

@ -754,6 +754,12 @@ public class BuiltinTests {
return 0; return 0;
} }
static int test_0_nfloat_isnan ()
{
var x = (nfloat) float.NaN;
return nfloat.IsNaN (x) ? 0 : 1;
}
// static int test_0_nfloat_call_boxed_equals () // static int test_0_nfloat_call_boxed_equals ()
// { // {
// object x = new nfloat (10f); // object x = new nfloat (10f);

View File

@ -1 +1 @@
bacf63405d960e27d5c22d091b687e9f914574ab 77cce7da80d67381efcaaa44dca2990738cd9dd6

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/ac8b05bd" #define FULL_VERSION "explicit/3a18dce"

Binary file not shown.

View File

@ -1 +1 @@
c97f53c1a02209c0dc09fe8b6312e60f7fa52bef 9935789958d81f0128a01e7bd644d56c888ef96e

Binary file not shown.

View File

@ -1 +1 @@
691d93b3677ff19915310263729d818f55720a48 22d59f4082d1b7273813a16d2fdc7f2917b49416

Binary file not shown.

View File

@ -1 +1 @@
8ebad121d3967fa847df6d03ebdf71d9ba78af6a 5d012f5f1f5d51bd5c716eeffd718f3764877881

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.16.0.135\n" "Project-Id-Version: mono 5.16.0.138\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: 2018-09-01 08:06+0000\n" "POT-Creation-Date: 2018-09-02 08:04+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 @@
fcd4a445ec738115bf0045081739c897f7e438f0 39cb0fcda7ef407aaf45e01c1d3dc8eb4ce9bc35