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

Imported Upstream version 5.16.0.138

Browse Source 
Former-commit-id: 27d945cf26af6d3ff6c7fbee29d31bf2249381d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-09-02 08:18:58 +00:00
parent 526ff2cf78
commit e05545e6b2
42 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mono/metadata/object-internals.h
View File

@@ -13,6 +13,7 @@
#include <mono/metadata/class-internals.h>
#include <mono/metadata/threads-types.h>
#include <mono/metadata/handle.h>
#include <mono/metadata/abi-details.h>
#include "mono/utils/mono-compiler.h"
#include "mono/utils/mono-error.h"
#include "mono/utils/mono-error-internals.h"
@@ -135,6 +136,8 @@ struct _MonoString {
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_domain(obj) (((MonoObject*)(obj))->vtable->domain)

2
mono/metadata/object.c.REMOVED.git-id
View File

@@ -1 +1 @@
408c5d201edf2695cf70e933d9e77959fd6a1f33
960a260ea505c05f293bd6311205a73eb083e26f

2
mono/metadata/sgen-client-mono.h
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.
*/
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)) {
return sgen_mono_array_size (vtable, (MonoArray*)o, NULL, 0);
} else {

6
mono/mini/builtin-types.cs
View File

@@ -754,6 +754,12 @@ public class BuiltinTests {
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 ()
// {
// object x = new nfloat (10f);

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

@@ -1 +1 @@
bacf63405d960e27d5c22d091b687e9f914574ab
77cce7da80d67381efcaaa44dca2990738cd9dd6

2
mono/mini/version.h
View File

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