Imported Upstream version 5.18.0.175

Former-commit-id: 4da3f5a0da82aba8257bc2cfeadea4fa9438fac4
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-10-23 08:23:38 +00:00
parent b0d19ce0e1
commit 5014728567
85 changed files with 117 additions and 96 deletions

View File

@ -1 +1 @@
e7676284a28529def2313ff3d9d16399599feb5a 20c0003b33cfa61aaa10466350a03f30d8f0116d

View File

@ -1 +1 @@
57aea1ddfca9ac0e28658115f2e9d64af595dea2 2cdceed54f5421c980497656cd9258fefa2f6571

View File

@ -1070,7 +1070,7 @@ mono_class_instance_size (MonoClass *klass)
<div class="mapi-ptr"></div> <div class="mapi-ptr"></div>
<div class="mapi-declaration mapi-section">Syntax</div> <div class="mapi-declaration mapi-section">Syntax</div>
<div class="mapi-prototype">gboolean <div class="mapi-prototype">mono_bool
mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass) mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass)
</div> </div>

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.18.0.170"; public const string MonoVersion = "5.18.0.175";
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 @@
9fd23fb5d11f48db3c6617281544330923c0fb4f db7bc510530e8816732e87bfca63d40a7cdfa2e1

View File

@ -1 +1 @@
34119802dd4c3fb18352e9841c78ae89bb9bf8b5 29721b37a6731490e8d1a1e15518934ea9ad110e

View File

@ -1 +1 @@
6085ab7d0fcc015d403fc80ec1919c010d57d7b9 8f5db28b4b38bf6efbb20560283df89c46fb69a1

View File

@ -1 +1 @@
7461f44dc8fba16c94aae0b77f90a2c244abbbf3 1e43898d5c0583301d258392ef291a57abeca266

View File

@ -1 +1 @@
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85

View File

@ -1 +1 @@
3f39704c9ca7c7c843c26e835dac8242d2fbea2d a1cac209c7dedafd359f0a91fb3c617dc231d24a

View File

@ -1 +1 @@
39d2084efa771325cbde99e8772fa026c5a276a9 2031b2e0f6fef9ac96eb559fa04c49c3c02c914c

View File

@ -1 +1 @@
9fd23fb5d11f48db3c6617281544330923c0fb4f db7bc510530e8816732e87bfca63d40a7cdfa2e1

View File

@ -1 +1 @@
34119802dd4c3fb18352e9841c78ae89bb9bf8b5 29721b37a6731490e8d1a1e15518934ea9ad110e

View File

@ -1 +1 @@
6085ab7d0fcc015d403fc80ec1919c010d57d7b9 8f5db28b4b38bf6efbb20560283df89c46fb69a1

View File

@ -1 +1 @@
7461f44dc8fba16c94aae0b77f90a2c244abbbf3 1e43898d5c0583301d258392ef291a57abeca266

View File

@ -1 +1 @@
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85

View File

@ -1 +1 @@
3f39704c9ca7c7c843c26e835dac8242d2fbea2d a1cac209c7dedafd359f0a91fb3c617dc231d24a

View File

@ -1 +1 @@
39d2084efa771325cbde99e8772fa026c5a276a9 2031b2e0f6fef9ac96eb559fa04c49c3c02c914c

View File

@ -1 +1 @@
9fd23fb5d11f48db3c6617281544330923c0fb4f db7bc510530e8816732e87bfca63d40a7cdfa2e1

View File

@ -1 +1 @@
34119802dd4c3fb18352e9841c78ae89bb9bf8b5 29721b37a6731490e8d1a1e15518934ea9ad110e

View File

@ -1 +1 @@
6085ab7d0fcc015d403fc80ec1919c010d57d7b9 8f5db28b4b38bf6efbb20560283df89c46fb69a1

View File

@ -1 +1 @@
7461f44dc8fba16c94aae0b77f90a2c244abbbf3 1e43898d5c0583301d258392ef291a57abeca266

View File

@ -1 +1 @@
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85

View File

@ -1 +1 @@
3f39704c9ca7c7c843c26e835dac8242d2fbea2d a1cac209c7dedafd359f0a91fb3c617dc231d24a

View File

@ -1 +1 @@
39d2084efa771325cbde99e8772fa026c5a276a9 2031b2e0f6fef9ac96eb559fa04c49c3c02c914c

View File

@ -1 +1 @@
9fd23fb5d11f48db3c6617281544330923c0fb4f db7bc510530e8816732e87bfca63d40a7cdfa2e1

View File

@ -1 +1 @@
34119802dd4c3fb18352e9841c78ae89bb9bf8b5 29721b37a6731490e8d1a1e15518934ea9ad110e

View File

@ -1 +1 @@
6085ab7d0fcc015d403fc80ec1919c010d57d7b9 8f5db28b4b38bf6efbb20560283df89c46fb69a1

View File

@ -1 +1 @@
7461f44dc8fba16c94aae0b77f90a2c244abbbf3 1e43898d5c0583301d258392ef291a57abeca266

View File

@ -1 +1 @@
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5 c3e97f3e8b0deb139f1f7bd78d48e3cf50234e85

View File

@ -1 +1 @@
3f39704c9ca7c7c843c26e835dac8242d2fbea2d a1cac209c7dedafd359f0a91fb3c617dc231d24a

View File

@ -1 +1 @@
39d2084efa771325cbde99e8772fa026c5a276a9 2031b2e0f6fef9ac96eb559fa04c49c3c02c914c

View File

@ -899,7 +899,7 @@ handle_enum:
} }
case MONO_TYPE_VALUETYPE: case MONO_TYPE_VALUETYPE:
if (m_class_is_enumtype (sig->params [i]->data.klass)) { if (m_class_is_enumtype (sig->params [i]->data.klass)) {
type = mono_class_enum_basetype (sig->params [i]->data.klass)->type; type = mono_class_enum_basetype_internal (sig->params [i]->data.klass)->type;
goto handle_enum; goto handle_enum;
} else { } else {
g_warning ("generic valutype not handled in custom attr value decoding"); g_warning ("generic valutype not handled in custom attr value decoding");

View File

@ -1 +1 @@
d76f2e3f332d39c102a21e2a1254a64d6e1ace4a 46d49f6e526bdb14c329f92c43d12391d5efb963

View File

@ -1202,6 +1202,9 @@ mono_class_has_variant_generic_params (MonoClass *klass);
gboolean gboolean
mono_class_is_variant_compatible (MonoClass *klass, MonoClass *oklass, gboolean check_for_reference_conv); mono_class_is_variant_compatible (MonoClass *klass, MonoClass *oklass, gboolean check_for_reference_conv);
mono_bool
mono_class_is_assignable_from_internal (MonoClass *klass, MonoClass *oklass);
gboolean mono_is_corlib_image (MonoImage *image); gboolean mono_is_corlib_image (MonoImage *image);
MonoType* MonoType*
@ -1433,6 +1436,9 @@ mono_class_contextbound_bit_offset (int* byte_offset_out, guint8* mask_out);
gboolean gboolean
mono_class_init_checked (MonoClass *klass, MonoError *error); mono_class_init_checked (MonoClass *klass, MonoError *error);
MonoType*
mono_class_enum_basetype_internal (MonoClass *klass);
/*Now that everything has been defined, let's include the inline functions */ /*Now that everything has been defined, let's include the inline functions */
#include <mono/metadata/class-inlines.h> #include <mono/metadata/class-inlines.h>

View File

@ -1 +1 @@
bcea1e4c2a0e9cba38437bfafa521f6d88a548f0 06b1a4e63783d78c067bb06485cfb9c96a6301fc

View File

@ -123,7 +123,7 @@ MONO_API mono_bool
mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc, mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc,
mono_bool check_interfaces); mono_bool check_interfaces);
MONO_API mono_bool MONO_API MONO_RT_EXTERNAL_ONLY mono_bool
mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass); mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass);
MONO_API MONO_RT_EXTERNAL_ONLY MONO_API MONO_RT_EXTERNAL_ONLY
@ -152,7 +152,7 @@ MONO_API MONO_RT_EXTERNAL_ONLY
mono_bool mono_bool
mono_class_is_enum (MonoClass *klass); mono_class_is_enum (MonoClass *klass);
MONO_API MonoType* MONO_API MONO_RT_EXTERNAL_ONLY MonoType*
mono_class_enum_basetype (MonoClass *klass); mono_class_enum_basetype (MonoClass *klass);
MONO_API MONO_RT_EXTERNAL_ONLY MONO_API MONO_RT_EXTERNAL_ONLY

View File

@ -348,7 +348,7 @@ handle_enum:
} }
case MONO_TYPE_VALUETYPE: case MONO_TYPE_VALUETYPE:
if (m_class_is_enumtype (t->data.klass)) { if (m_class_is_enumtype (t->data.klass)) {
type = mono_class_enum_basetype (t->data.klass)->type; type = mono_class_enum_basetype_internal (t->data.klass)->type;
goto handle_enum; goto handle_enum;
} else { } else {
MonoClass *k = t->data.klass; MonoClass *k = t->data.klass;
@ -489,7 +489,7 @@ handle_enum:
return_val_if_nok (error, NULL); return_val_if_nok (error, NULL);
basetype = m_class_get_byval_arg (tklass)->type; basetype = m_class_get_byval_arg (tklass)->type;
if (basetype == MONO_TYPE_VALUETYPE && m_class_is_enumtype (tklass)) if (basetype == MONO_TYPE_VALUETYPE && m_class_is_enumtype (tklass))
basetype = mono_class_enum_basetype (tklass)->type; basetype = mono_class_enum_basetype_internal (tklass)->type;
if (basetype == MONO_TYPE_GENERICINST) { if (basetype == MONO_TYPE_GENERICINST) {
MonoGenericClass * mgc = m_class_get_byval_arg (tklass)->data.generic_class; MonoGenericClass * mgc = m_class_get_byval_arg (tklass)->data.generic_class;
@ -1451,7 +1451,7 @@ mono_custom_attrs_construct_by_type (MonoCustomAttrInfo *cinfo, MonoClass *attr_
for (i = 0; i < cinfo->num_attrs; ++i) { for (i = 0; i < cinfo->num_attrs; ++i) {
MonoMethod *ctor = cinfo->attrs[i].ctor; MonoMethod *ctor = cinfo->attrs[i].ctor;
g_assert (ctor); g_assert (ctor);
if (mono_class_is_assignable_from (attr_klass, ctor->klass)) if (mono_class_is_assignable_from_internal (attr_klass, ctor->klass))
n++; n++;
} }
} else { } else {
@ -1463,7 +1463,7 @@ mono_custom_attrs_construct_by_type (MonoCustomAttrInfo *cinfo, MonoClass *attr_
n = 0; n = 0;
for (i = 0; i < cinfo->num_attrs; ++i) { for (i = 0; i < cinfo->num_attrs; ++i) {
MonoCustomAttrEntry *centry = &cinfo->attrs [i]; MonoCustomAttrEntry *centry = &cinfo->attrs [i];
if (!attr_klass || mono_class_is_assignable_from (attr_klass, centry->ctor->klass)) { if (!attr_klass || mono_class_is_assignable_from_internal (attr_klass, centry->ctor->klass)) {
create_custom_attr_into_array (cinfo->image, centry->ctor, centry->data, create_custom_attr_into_array (cinfo->image, centry->ctor, centry->data,
centry->data_size, result, n, error); centry->data_size, result, n, error);
goto_if_nok (error, exit); goto_if_nok (error, exit);
@ -1913,7 +1913,7 @@ mono_custom_attrs_has_attr (MonoCustomAttrInfo *ainfo, MonoClass *attr_klass)
if (centry->ctor == NULL) if (centry->ctor == NULL)
continue; continue;
MonoClass *klass = centry->ctor->klass; MonoClass *klass = centry->ctor->klass;
if (klass == attr_klass || mono_class_has_parent (klass, attr_klass) || (MONO_CLASS_IS_INTERFACE (attr_klass) && mono_class_is_assignable_from (attr_klass, klass))) if (klass == attr_klass || mono_class_has_parent (klass, attr_klass) || (MONO_CLASS_IS_INTERFACE (attr_klass) && mono_class_is_assignable_from_internal (attr_klass, klass)))
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -1946,7 +1946,7 @@ mono_custom_attrs_get_attr_checked (MonoCustomAttrInfo *ainfo, MonoClass *attr_k
if (centry->ctor == NULL) if (centry->ctor == NULL)
continue; continue;
MonoClass *klass = centry->ctor->klass; MonoClass *klass = centry->ctor->klass;
if (attr_klass == klass || mono_class_is_assignable_from (attr_klass, klass)) if (attr_klass == klass || mono_class_is_assignable_from_internal (attr_klass, klass))
break; break;
} }
if (centry == NULL) if (centry == NULL)

View File

@ -65,4 +65,13 @@ guint32
mono_icall_drive_info_get_drive_type (MonoString *root_path_name); mono_icall_drive_info_get_drive_type (MonoString *root_path_name);
#endif /* !G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */ #endif /* !G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT) */
void*
mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles, mono_bool *foreign);
MONO_PAL_API void
mono_add_internal_call_with_flags (const char *name, const void* method, gboolean cooperative);
MONO_PROFILER_API void
mono_add_internal_call_internal (const char *name, gconstpointer method);
#endif /* __MONO_METADATA_ICALL_INTERNALS_H__ */ #endif /* __MONO_METADATA_ICALL_INTERNALS_H__ */

View File

@ -1 +1 @@
6a77d712779a343504f08609285d7a492cb78597 8eaf4a87588c100403f0dc44a989b985a320ef28

View File

@ -1838,7 +1838,7 @@ get_method_constrained (MonoImage *image, MonoMethod *method, MonoClass *constra
error_init (error); error_init (error);
if (!mono_class_is_assignable_from (base_class, constrained_class)) { if (!mono_class_is_assignable_from_internal (base_class, constrained_class)) {
char *base_class_name = mono_type_get_full_name (base_class); char *base_class_name = mono_type_get_full_name (base_class);
char *constrained_class_name = mono_type_get_full_name (constrained_class); char *constrained_class_name = mono_type_get_full_name (constrained_class);
mono_error_set_invalid_operation (error, "constrained call: %s is not assignable from %s", base_class_name, constrained_class_name); mono_error_set_invalid_operation (error, "constrained call: %s is not assignable from %s", base_class_name, constrained_class_name);

View File

@ -55,15 +55,15 @@ mono_method_get_flags (MonoMethod *method, uint32_t *iflags);
MONO_API uint32_t MONO_API uint32_t
mono_method_get_index (MonoMethod *method); mono_method_get_index (MonoMethod *method);
MONO_API void MONO_API MONO_RT_EXTERNAL_ONLY void
mono_add_internal_call (const char *name, const void* method); mono_add_internal_call (const char *name, const void* method);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_dangerous_add_raw_internal_call (const char *name, const void* method);
MONO_API void* MONO_API void*
mono_lookup_internal_call (MonoMethod *method); mono_lookup_internal_call (MonoMethod *method);
void*
mono_lookup_internal_call_full (MonoMethod *method, mono_bool *uses_handles);
MONO_API const char* MONO_API const char*
mono_lookup_icall_symbol (MonoMethod *m); mono_lookup_icall_symbol (MonoMethod *m);

View File

@ -1 +1 @@
0851a5b12ca8942603fd018e39a90fdac1454109 6b5a6b7a20e1058e339eb3ff5811117fd6c8da7c

View File

@ -1 +1 @@
683582c79fe6e5aa8bedafea63a75054f637c92b fa37c8c819bf0439d209c38cf5f96d93f98c2386

View File

@ -1 +1 @@
20bbcdecd735865a236f0fcd6309a4c18095285e 04468d1600fb87495862f1ac3fc3f0aa0e673090

View File

@ -1 +1 @@
4f6a30f08bf6a75757f62af8341d750b41441f67 ca60c3c56263eeb0c3acd0d0fe12df90568ba022

View File

@ -11,6 +11,7 @@
#include "pal_io.h" #include "pal_io.h"
#include "mono/utils/mono-threads-api.h" #include "mono/utils/mono-threads-api.h"
#include "mono/utils/atomic.h" #include "mono/utils/atomic.h"
#include "mono/metadata/icall-internals.h"
#include "pal-icalls.h" #include "pal-icalls.h"
@ -27,10 +28,10 @@ mono_pal_init (void)
{ {
volatile static gboolean module_initialized = FALSE; volatile static gboolean module_initialized = FALSE;
if (mono_atomic_cas_i32 (&module_initialized, TRUE, FALSE) == FALSE) { if (mono_atomic_cas_i32 (&module_initialized, TRUE, FALSE) == FALSE) {
mono_add_internal_call ("Interop/Sys::Read", ves_icall_Interop_Sys_Read); mono_add_internal_call_with_flags ("Interop/Sys::Read", ves_icall_Interop_Sys_Read, TRUE);
#if defined(__APPLE__) #if defined(__APPLE__)
mono_add_internal_call ("Interop/RunLoop::CFRunLoopRun", ves_icall_Interop_RunLoop_CFRunLoopRun); mono_add_internal_call_with_flags ("Interop/RunLoop::CFRunLoopRun", ves_icall_Interop_RunLoop_CFRunLoopRun, TRUE);
#endif #endif
} }

View File

@ -1396,7 +1396,7 @@ mono_get_object_from_blob (MonoDomain *domain, MonoType *type, const char *blob,
return_val_if_nok (error, NULL); return_val_if_nok (error, NULL);
retval = mono_object_get_data (object); retval = mono_object_get_data (object);
if (m_class_is_enumtype (klass)) if (m_class_is_enumtype (klass))
basetype = mono_class_enum_basetype (klass); basetype = mono_class_enum_basetype_internal (klass);
} else { } else {
retval = &object; retval = &object;
} }

View File

@ -169,6 +169,8 @@ mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref)
if (!toggleref_callback) if (!toggleref_callback)
return; return;
MONO_ENTER_GC_UNSAFE;
SGEN_LOG (4, "Adding toggleref %p %d", object, strong_ref); SGEN_LOG (4, "Adding toggleref %p %d", object, strong_ref);
sgen_gc_lock (); sgen_gc_lock ();
@ -179,6 +181,8 @@ mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref)
++toggleref_array_size; ++toggleref_array_size;
sgen_gc_unlock (); sgen_gc_unlock ();
MONO_EXIT_GC_UNSAFE;
} }
/** /**

View File

@ -26,7 +26,7 @@ typedef enum {
} MonoToggleRefStatus; } MonoToggleRefStatus;
MONO_API void mono_gc_toggleref_register_callback (MonoToggleRefStatus (*proccess_toggleref) (MonoObject *obj)); MONO_API void mono_gc_toggleref_register_callback (MonoToggleRefStatus (*proccess_toggleref) (MonoObject *obj));
MONO_API void mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref); MONO_API MONO_RT_EXTERNAL_ONLY void mono_gc_toggleref_add (MonoObject *object, mono_bool strong_ref);
MONO_END_DECLS MONO_END_DECLS

View File

@ -560,7 +560,7 @@ handle_enum:
MonoClass *klass = val->vtable->klass; MonoClass *klass = val->vtable->klass;
if (m_class_is_enumtype (klass)) { if (m_class_is_enumtype (klass)) {
*ret_type = mono_class_enum_basetype (klass)->type; *ret_type = mono_class_enum_basetype_internal (klass)->type;
goto handle_enum; goto handle_enum;
} else if (mono_is_corlib_image (m_class_get_image (klass)) && strcmp (m_class_get_name_space (klass), "System") == 0 && strcmp (m_class_get_name (klass), "DateTime") == 0) { } else if (mono_is_corlib_image (m_class_get_image (klass)) && strcmp (m_class_get_name_space (klass), "System") == 0 && strcmp (m_class_get_name (klass), "DateTime") == 0) {
len = 8; len = 8;

View File

@ -1 +1 @@
cf0f2b72994b27812e93ff84a7d58af092888200 a8c931570e89a5bfc2e85f349c2162d26eb3f2c0

View File

@ -1 +1 @@
149519b35396644935e75f23d0b518770facb63e ac0f0729357361250b5c8e4eb2e9a9311f965f0f

View File

@ -1 +1 @@
622c71c5beca1500ec3039c31189799f1ad2ebe2 d031bed216d0d175359b356afab000ee125c567d

View File

@ -1 +1 @@
ece77a766c2edb261464566d6498fb8961e8a86d b5e7a3bec5e7b549daa725065330bcb0a16ce79a

View File

@ -48,7 +48,7 @@ handle_enum:
return 'V'; return 'V';
case MONO_TYPE_VALUETYPE: case MONO_TYPE_VALUETYPE:
if (m_class_is_enumtype (t->data.klass)) { if (m_class_is_enumtype (t->data.klass)) {
t = mono_class_enum_basetype (t->data.klass); t = mono_class_enum_basetype_internal (t->data.klass);
goto handle_enum; goto handle_enum;
} }

View File

@ -54,7 +54,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con
for (i = 0; i < header->num_clauses; ++i) { for (i = 0; i < header->num_clauses; ++i) {
clause = &header->clauses [i]; clause = &header->clauses [i];
if (MONO_OFFSET_IN_CLAUSE (clause, bb->real_offset)) { if (MONO_OFFSET_IN_CLAUSE (clause, bb->real_offset)) {
if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE && clause->data.catch_class && mono_class_is_assignable_from (clause->data.catch_class, exclass)) { if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE && clause->data.catch_class && mono_class_is_assignable_from_internal (clause->data.catch_class, exclass)) {
MonoBasicBlock *tbb; MonoBasicBlock *tbb;
/* get the basic block for the handler and /* get the basic block for the handler and

View File

@ -1 +1 @@
65be6782ad6ac30a8926beb026517429580d596f c595475b79fef1ad30a051f10f01650b79524be3

View File

@ -967,7 +967,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype)
g_hash_table_insert (cache, klass, die); g_hash_table_insert (cache, klass, die);
if (m_class_is_enumtype (klass)) { if (m_class_is_enumtype (klass)) {
int size = mono_class_value_size (mono_class_from_mono_type (mono_class_enum_basetype (klass)), NULL); int size = mono_class_value_size (mono_class_from_mono_type (mono_class_enum_basetype_internal (klass)), NULL);
emit_label (w, die); emit_label (w, die);
@ -975,7 +975,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype)
emit_string (w, full_name); emit_string (w, full_name);
emit_uleb128 (w, size); emit_uleb128 (w, size);
for (k = 0; k < G_N_ELEMENTS (basic_types); ++k) for (k = 0; k < G_N_ELEMENTS (basic_types); ++k)
if (basic_types [k].type == mono_class_enum_basetype (klass)->type) if (basic_types [k].type == mono_class_enum_basetype_internal (klass)->type)
break; break;
g_assert (k < G_N_ELEMENTS (basic_types)); g_assert (k < G_N_ELEMENTS (basic_types));
emit_symbol_diff (w, basic_types [k].die_name, ".Ldebug_info_start", 0); emit_symbol_diff (w, basic_types [k].die_name, ".Ldebug_info_start", 0);
@ -996,7 +996,7 @@ emit_class_dwarf_info (MonoDwarfWriter *w, MonoClass *klass, gboolean vtype)
p = mono_class_get_field_default_value (field, &def_type); p = mono_class_get_field_default_value (field, &def_type);
/* len = */ mono_metadata_decode_blob_size (p, &p); /* len = */ mono_metadata_decode_blob_size (p, &p);
switch (mono_class_enum_basetype (klass)->type) { switch (mono_class_enum_basetype_internal (klass)->type) {
case MONO_TYPE_U1: case MONO_TYPE_U1:
case MONO_TYPE_I1: case MONO_TYPE_I1:
case MONO_TYPE_BOOLEAN: case MONO_TYPE_BOOLEAN:

View File

@ -208,7 +208,7 @@ enum_type:
return MINT_TYPE_O; return MINT_TYPE_O;
case MONO_TYPE_VALUETYPE: case MONO_TYPE_VALUETYPE:
if (m_class_is_enumtype (type->data.klass)) { if (m_class_is_enumtype (type->data.klass)) {
type = mono_class_enum_basetype (type->data.klass); type = mono_class_enum_basetype_internal (type->data.klass);
goto enum_type; goto enum_type;
} else } else
return MINT_TYPE_VT; return MINT_TYPE_VT;

View File

@ -1 +1 @@
9602f0f090d055d50702c425cd9854c353288089 0cdb06c50617b775233a4436d4c697e5f9373d5d

View File

@ -1 +1 @@
bf983dbc7462d8db220cf3b14b4369b0e28b72a6 03312eb8ec9889e301ef79a0afc4dfad9afb65de

View File

@ -1 +1 @@
04ed46d337048ccbd364cc2f24f9e3b0ca3a0a29 553eed9e186f93fc74e6a7ca8190ca2ade6791ac

View File

@ -1 +1 @@
e95d70c4a30dee531ef9d06bdc74e4ba35b3c899 609a53a4d5b40362f7fe39ab2f449030d2736aea

View File

@ -1 +1 @@
bd8e9cbb9408ac731f568c0518dd2b956e072775 a12cc5e6f98195ed59dd832b3baf6795757bf368

View File

@ -1 +1 @@
ced583271c5c4e655dbd46bd7b381e31e593f521 4ffa27c9063cdf3e0d77896d2c842852e9f0c50a

View File

@ -1 +1 @@
3293b2dfc8d35b4430791eb9b625668fbabf322d c66d6a485515096ce35adf3da1f12a0c160b0bb3

View File

@ -210,7 +210,7 @@ mono_wasm_set_timeout (int timeout, int id)
void void
mono_arch_register_icall (void) mono_arch_register_icall (void)
{ {
mono_add_internal_call ("System.Threading.WasmRuntime::SetTimeout", mono_wasm_set_timeout); mono_add_internal_call_internal ("System.Threading.WasmRuntime::SetTimeout", mono_wasm_set_timeout);
} }
void void

View File

@ -1 +1 @@
c1550190786135513e718ba8b6271d86611861f9 95a16954baa4e86f8b831345b14d2d152ceec11f

View File

@ -6,6 +6,7 @@
#include "tasklets.h" #include "tasklets.h"
#include "mono/metadata/exception.h" #include "mono/metadata/exception.h"
#include "mono/metadata/gc-internals.h" #include "mono/metadata/gc-internals.h"
#include "mono/metadata/icall-internals.h"
#include "mini.h" #include "mini.h"
#include "mini-runtime.h" #include "mini-runtime.h"
@ -143,11 +144,11 @@ mono_tasklets_init (void)
{ {
mono_os_mutex_init_recursive (&tasklets_mutex); mono_os_mutex_init_recursive (&tasklets_mutex);
mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::alloc", continuation_alloc);
mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::free", continuation_free);
mono_add_internal_call ("Mono.Tasklets.Continuation::mark", continuation_mark_frame); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::mark", continuation_mark_frame);
mono_add_internal_call ("Mono.Tasklets.Continuation::store", continuation_store); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::store", continuation_store);
mono_add_internal_call ("Mono.Tasklets.Continuation::restore", continuation_restore); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::restore", continuation_restore);
} }
void void
@ -201,11 +202,11 @@ continuation_restore (MonoContinuation *cont, int state)
void void
mono_tasklets_init(void) mono_tasklets_init(void)
{ {
mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::alloc", continuation_alloc);
mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::free", continuation_free);
mono_add_internal_call ("Mono.Tasklets.Continuation::mark", continuation_mark_frame); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::mark", continuation_mark_frame);
mono_add_internal_call ("Mono.Tasklets.Continuation::store", continuation_store); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::store", continuation_store);
mono_add_internal_call ("Mono.Tasklets.Continuation::restore", continuation_restore); mono_add_internal_call_internal ("Mono.Tasklets.Continuation::restore", continuation_restore);
} }
#endif #endif

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/d7dcd45" #define FULL_VERSION "explicit/7a7768f"

View File

@ -1 +1 @@
a248b0bc22b1bda3ccc785b7a9be156dc1ac3799 6b6f88d1f40666b792a333eb6f94248292baeaee

Binary file not shown.

View File

@ -1 +1 @@
5e821d27b7af7f50711b910568945cb723b79cd0 b287893d72f67be503b3a69695b79f89538ee420

Binary file not shown.

View File

@ -1 +1 @@
1870abcb201ac6b07ff63b096b2573738824de31 c2cbb3f5d6952da2c7614ee72cadc0724967c3bc

Binary file not shown.

View File

@ -1 +1 @@
31f00599305f2986164407653773487d6b4b6413 bec19c1f4a6990dbecd62e33ceacd8f90eec9a21

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 5.18.0.170\n" "Project-Id-Version: mono 5.18.0.175\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-10-22 08:12+0000\n" "POT-Creation-Date: 2018-10-23 08:06+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 @@
f4f705d44e83353a50f50096ab2fe8f11d4f2af5 3b0a20c296e774df00255359583484e6bd88bdbd