#include <mono/metadata/threads.h>
#include <mono/metadata/threads-types.h>
#include <mono/metadata/threadpool.h>
+#include <mono/metadata/threadpool-microsoft.h>
#include <mono/metadata/monitor.h>
#include <mono/metadata/reflection.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/verify-internals.h>
#include <mono/metadata/runtime.h>
#include <mono/metadata/file-mmap.h>
+#include <mono/metadata/seq-points-data.h>
#include <mono/io-layer/io-layer.h>
#include <mono/utils/strtod.h>
#include <mono/utils/monobitset.h>
#endif
#include "decimal-ms.h"
-extern MonoString* ves_icall_System_Environment_GetOSVersionString (void) MONO_INTERNAL;
+extern MonoString* ves_icall_System_Environment_GetOSVersionString (void);
ICALL_EXPORT MonoReflectionAssembly* ves_icall_System_Reflection_Assembly_GetCallingAssembly (void);
MonoArray *ao, *io;
gint32 i, pos, *ind;
- MONO_CHECK_ARG_NULL (idxs);
+ MONO_CHECK_ARG_NULL (idxs, NULL);
io = (MonoArray *)idxs;
ic = (MonoClass *)io->obj.vtable->klass;
ac = (MonoClass *)ao->obj.vtable->klass;
g_assert (ic->rank == 1);
- if (io->bounds != NULL || io->max_length != ac->rank)
- mono_raise_exception (mono_get_exception_argument (NULL, NULL));
+ if (io->bounds != NULL || io->max_length != ac->rank) {
+ mono_set_pending_exception (mono_get_exception_argument (NULL, NULL));
+ return NULL;
+ }
ind = (gint32 *)io->vector;
if (ao->bounds == NULL) {
- if (*ind < 0 || *ind >= ao->max_length)
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ if (*ind < 0 || *ind >= ao->max_length) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return NULL;
+ }
return ves_icall_System_Array_GetValueImpl (this, *ind);
}
- for (i = 0; i < ac->rank; i++)
+ for (i = 0; i < ac->rank; i++) {
if ((ind [i] < ao->bounds [i].lower_bound) ||
- (ind [i] >= (mono_array_lower_bound_t)ao->bounds [i].length + ao->bounds [i].lower_bound))
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ (ind [i] >= (mono_array_lower_bound_t)ao->bounds [i].length + ao->bounds [i].lower_bound)) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return NULL;
+ }
+ }
pos = ind [0] - ao->bounds [0].lower_bound;
for (i = 1; i < ac->rank; i++)
}
#define NO_WIDENING_CONVERSION G_STMT_START{\
- mono_raise_exception (mono_get_exception_argument ( \
+ mono_set_pending_exception (mono_get_exception_argument ( \
"value", "not a widening conversion")); \
+ return; \
}G_STMT_END
#define CHECK_WIDENING_CONVERSION(extra) G_STMT_START{\
- if (esize < vsize + (extra)) \
- mono_raise_exception (mono_get_exception_argument ( \
+ if (esize < vsize + (extra)) { \
+ mono_set_pending_exception (mono_get_exception_argument ( \
"value", "not a widening conversion")); \
+ return; \
+ } \
}G_STMT_END
#define INVALID_CAST G_STMT_START{ \
mono_get_runtime_callbacks ()->set_cast_details (vc, ec); \
- mono_raise_exception (mono_get_exception_invalid_cast ()); \
+ mono_set_pending_exception (mono_get_exception_invalid_cast ()); \
+ return; \
}G_STMT_END
/* Check element (destination) type. */
INVALID_CAST;
}
break;
+ default:
+ break;
}
if (!ec->valuetype) {
MonoClass *ac, *ic;
gint32 i, pos, *ind;
- MONO_CHECK_ARG_NULL (idxs);
+ MONO_CHECK_ARG_NULL (idxs,);
ic = idxs->obj.vtable->klass;
ac = this->obj.vtable->klass;
g_assert (ic->rank == 1);
- if (idxs->bounds != NULL || idxs->max_length != ac->rank)
- mono_raise_exception (mono_get_exception_argument (NULL, NULL));
+ if (idxs->bounds != NULL || idxs->max_length != ac->rank) {
+ mono_set_pending_exception (mono_get_exception_argument (NULL, NULL));
+ return;
+ }
ind = (gint32 *)idxs->vector;
if (this->bounds == NULL) {
- if (*ind < 0 || *ind >= this->max_length)
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ if (*ind < 0 || *ind >= this->max_length) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return;
+ }
ves_icall_System_Array_SetValueImpl (this, value, *ind);
return;
for (i = 0; i < ac->rank; i++)
if ((ind [i] < this->bounds [i].lower_bound) ||
- (ind [i] >= (mono_array_lower_bound_t)this->bounds [i].length + this->bounds [i].lower_bound))
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ (ind [i] >= (mono_array_lower_bound_t)this->bounds [i].length + this->bounds [i].lower_bound)) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return;
+ }
pos = ind [0] - this->bounds [0].lower_bound;
for (i = 1; i < ac->rank; i++)
uintptr_t *sizes, i;
gboolean bounded = FALSE;
- MONO_CHECK_ARG_NULL (type);
- MONO_CHECK_ARG_NULL (lengths);
+ MONO_CHECK_ARG_NULL (type, NULL);
+ MONO_CHECK_ARG_NULL (lengths, NULL);
- MONO_CHECK_ARG (lengths, mono_array_length (lengths) > 0);
+ MONO_CHECK_ARG (lengths, mono_array_length (lengths) > 0, NULL);
if (bounds)
- MONO_CHECK_ARG (bounds, mono_array_length (lengths) == mono_array_length (bounds));
+ MONO_CHECK_ARG (bounds, mono_array_length (lengths) == mono_array_length (bounds), NULL);
- for (i = 0; i < mono_array_length (lengths); i++)
- if (mono_array_get (lengths, gint32, i) < 0)
- mono_raise_exception (mono_get_exception_argument_out_of_range (NULL));
+ for (i = 0; i < mono_array_length (lengths); i++) {
+ if (mono_array_get (lengths, gint32, i) < 0) {
+ mono_set_pending_exception (mono_get_exception_argument_out_of_range (NULL));
+ return NULL;
+ }
+ }
klass = mono_class_from_mono_type (type->type);
mono_class_init_or_throw (klass);
uintptr_t *sizes, i;
gboolean bounded = FALSE;
- MONO_CHECK_ARG_NULL (type);
- MONO_CHECK_ARG_NULL (lengths);
+ MONO_CHECK_ARG_NULL (type, NULL);
+ MONO_CHECK_ARG_NULL (lengths, NULL);
- MONO_CHECK_ARG (lengths, mono_array_length (lengths) > 0);
+ MONO_CHECK_ARG (lengths, mono_array_length (lengths) > 0, NULL);
if (bounds)
- MONO_CHECK_ARG (bounds, mono_array_length (lengths) == mono_array_length (bounds));
+ MONO_CHECK_ARG (bounds, mono_array_length (lengths) == mono_array_length (bounds), NULL);
- for (i = 0; i < mono_array_length (lengths); i++)
+ for (i = 0; i < mono_array_length (lengths); i++) {
if ((mono_array_get (lengths, gint64, i) < 0) ||
- (mono_array_get (lengths, gint64, i) > MONO_ARRAY_MAX_INDEX))
- mono_raise_exception (mono_get_exception_argument_out_of_range (NULL));
+ (mono_array_get (lengths, gint64, i) > MONO_ARRAY_MAX_INDEX)) {
+ mono_set_pending_exception (mono_get_exception_argument_out_of_range (NULL));
+ return NULL;
+ }
+ }
klass = mono_class_from_mono_type (type->type);
mono_class_init_or_throw (klass);
gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
uintptr_t length;
- if ((dimension < 0) || (dimension >= rank))
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ if ((dimension < 0) || (dimension >= rank)) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return 0;
+ }
if (this->bounds == NULL)
length = this->max_length;
length = this->bounds [dimension].length;
#ifdef MONO_BIG_ARRAYS
- if (length > G_MAXINT32)
- mono_raise_exception (mono_get_exception_overflow ());
+ if (length > G_MAXINT32) {
+ mono_set_pending_exception (mono_get_exception_overflow ());
+ return 0;
+ }
#endif
return length;
}
{
gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
- if ((dimension < 0) || (dimension >= rank))
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ if ((dimension < 0) || (dimension >= rank)) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return 0;
+ }
if (this->bounds == NULL)
return this->max_length;
{
gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
- if ((dimension < 0) || (dimension >= rank))
- mono_raise_exception (mono_get_exception_index_out_of_range ());
+ if ((dimension < 0) || (dimension >= rank)) {
+ mono_set_pending_exception (mono_get_exception_index_out_of_range ());
+ return 0;
+ }
if (this->bounds == NULL)
return 0;
if (MONO_TYPE_IS_REFERENCE (type) || type->type == MONO_TYPE_VALUETYPE) {
MonoException *exc = mono_get_exception_argument("array",
"Cannot initialize array of non-primitive type.");
- mono_raise_exception (exc);
+ mono_set_pending_exception (exc);
+ return;
}
if (!(field_handle->type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA)) {
MonoException *exc = mono_get_exception_argument("field_handle",
"Field doesn't have an RVA");
- mono_raise_exception (exc);
+ mono_set_pending_exception (exc);
+ return;
}
size *= array->max_length;
if (size > mono_type_size (field_handle->type, &align)) {
MonoException *exc = mono_get_exception_argument("field_handle",
"Field not large enough to fill array");
- mono_raise_exception (exc);
+ mono_set_pending_exception (exc);
+ return;
}
#if G_BYTE_ORDER != G_LITTLE_ENDIAN
MonoClass *klass;
MonoVTable *vtable;
- MONO_CHECK_ARG_NULL (handle);
+ MONO_CHECK_ARG_NULL (handle,);
klass = mono_class_from_mono_type (handle);
- MONO_CHECK_ARG (handle, klass);
+ MONO_CHECK_ARG (handle, klass,);
vtable = mono_class_vtable_full (mono_domain_get (), klass, TRUE);
gpointer iter;
int count = 0;
- MONO_CHECK_ARG_NULL (that);
+ MONO_CHECK_ARG_NULL (that, FALSE);
if (this->vtable != that->vtable)
return FALSE;
ICALL_EXPORT gint32
ves_icall_ModuleBuilder_getToken (MonoReflectionModuleBuilder *mb, MonoObject *obj, gboolean create_open_instance)
{
- MONO_CHECK_ARG_NULL (obj);
+ MONO_CHECK_ARG_NULL (obj, 0);
return mono_image_create_token (mb->dynamic_image, obj, create_open_instance, TRUE);
}
MonoReflectionMethod *method,
MonoArray *opt_param_types)
{
- MONO_CHECK_ARG_NULL (method);
+ MONO_CHECK_ARG_NULL (method, 0);
return mono_image_create_method_token (
mb->dynamic_image, (MonoObject *) method, opt_param_types);
e = mono_get_exception_type_load (name, NULL);
mono_loader_clear_error ();
- if (e != NULL)
- mono_raise_exception (e);
+ if (e) {
+ mono_set_pending_exception (e);
+ return NULL;
+ }
}
return type;
return mono_type_get_object (domain, handle);
}
-ICALL_EXPORT MonoBoolean
-ves_icall_System_Type_EqualsInternal (MonoReflectionType *type, MonoReflectionType *c)
-{
- if (c && type->type && c->type)
- return mono_metadata_type_equal (type->type, c->type);
- else
- return (type == c) ? TRUE : FALSE;
-}
-
/* System.TypeCode */
typedef enum {
TYPECODE_EMPTY,
return 0;
}
-ICALL_EXPORT guint32
-ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c, MonoBoolean check_interfaces)
-{
- MonoDomain *domain;
- MonoClass *klass;
- MonoClass *klassc;
-
- g_assert (type != NULL);
-
- domain = ((MonoObject *)type)->vtable->domain;
-
- if (!c) /* FIXME: dont know what do do here */
- return 0;
-
- klass = mono_class_from_mono_type (type->type);
- klassc = mono_class_from_mono_type (c->type);
-
- /* Interface check requires a more complex setup so we
- * only do for them. Otherwise we simply avoid mono_class_init.
- */
- if (check_interfaces) {
- mono_class_init_or_throw (klass);
- mono_class_init_or_throw (klassc);
- } else if (!klass->supertypes || !klassc->supertypes) {
- mono_class_setup_supertypes (klass);
- mono_class_setup_supertypes (klassc);
- }
-
- if (type->type->byref)
- return klassc == mono_defaults.object_class;
-
- return mono_class_is_subclass_of (klass, klassc, check_interfaces);
-}
-
static gboolean
mono_type_is_primitive (MonoType *type)
{
ICALL_EXPORT guint32
ves_icall_type_is_assignable_from (MonoReflectionType *type, MonoReflectionType *c)
{
- MonoDomain *domain;
MonoClass *klass;
MonoClass *klassc;
g_assert (type != NULL);
- domain = ((MonoObject *)type)->vtable->domain;
-
klass = mono_class_from_mono_type (type->type);
klassc = mono_class_from_mono_type (c->type);
MonoClassField *cf = field->field;
MonoDomain *domain = mono_object_domain (field);
- if (fklass->image->assembly->ref_only)
- mono_raise_exception (mono_get_exception_invalid_operation (
+ if (fklass->image->assembly->ref_only) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation (
"It is illegal to get the value on a field on a type loaded using the ReflectionOnly methods."));
+ return NULL;
+ }
if (mono_security_core_clr_enabled ())
mono_security_core_clr_ensure_reflection_access_field (cf);
MonoType *type;
gchar *v;
- if (field->klass->image->assembly->ref_only)
- mono_raise_exception (mono_get_exception_invalid_operation (
+ if (field->klass->image->assembly->ref_only) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation (
"It is illegal to set the value on a field on a type loaded using the ReflectionOnly methods."));
+ return;
+ }
if (mono_security_core_clr_enabled ())
mono_security_core_clr_ensure_reflection_access_field (cf);
if (!mono_error_ok (&error))
mono_error_raise_exception (&error);
- if (!(t->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT))
- mono_raise_exception (mono_get_exception_invalid_operation (NULL));
+ if (!(t->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT)) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation (NULL));
+ return NULL;
+ }
if (image_is_dynamic (field->parent->image)) {
MonoClass *klass = field->parent;
g_assert (klass->ext->field_def_values);
def_type = klass->ext->field_def_values [fidx].def_type;
def_value = klass->ext->field_def_values [fidx].data;
- if (def_type == MONO_TYPE_END)
- mono_raise_exception (mono_get_exception_invalid_operation (NULL));
+ if (def_type == MONO_TYPE_END) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation (NULL));
+ return NULL;
+ }
} else {
def_value = mono_class_get_field_default_value (field, &def_type);
/* FIXME, maybe we should try to raise TLE if field->parent is broken */
- if (!def_value)
- mono_raise_exception (mono_get_exception_invalid_operation (NULL));
+ if (!def_value) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation (NULL));
+ return NULL;
+ }
}
/*FIXME unify this with reflection.c:mono_get_object_from_blob*/
ICALL_EXPORT MonoReflectionType*
ves_icall_get_type_parent (MonoReflectionType *type)
{
+ if (type->type->byref)
+ return NULL;
+
MonoClass *class = mono_class_from_mono_type (type->type);
return class->parent ? mono_type_get_object (mono_object_domain (type), &class->parent->byval_arg): NULL;
}
{
MonoClass *class;
- if (type->type->type != MONO_TYPE_ARRAY && type->type->type != MONO_TYPE_SZARRAY)
- mono_raise_exception (mono_get_exception_argument ("type", "Type must be an array type"));
+ if (type->type->type != MONO_TYPE_ARRAY && type->type->type != MONO_TYPE_SZARRAY) {
+ mono_set_pending_exception (mono_get_exception_argument ("type", "Type must be an array type"));
+ return 0;
+ }
class = mono_class_from_mono_type (type->type);
class = mono_class_from_mono_type (geninst);
/*we might inflate to the GTD*/
- if (class->generic_class && !mono_verifier_class_is_valid_generic_instantiation (class))
- mono_raise_exception (mono_get_exception_argument ("typeArguments", "Invalid generic arguments"));
+ if (class->generic_class && !mono_verifier_class_is_valid_generic_instantiation (class)) {
+ mono_set_pending_exception (mono_get_exception_argument ("typeArguments", "Invalid generic arguments"));
+ return NULL;
+ }
return mono_type_get_object (mono_object_domain (type), geninst);
}
-ICALL_EXPORT gboolean
-ves_icall_Type_get_IsGenericInstance (MonoReflectionType *type)
-{
- MonoClass *klass;
-
- if (type->type->byref)
- return FALSE;
-
- klass = mono_class_from_mono_type (type->type);
-
- return klass->generic_class != NULL;
-}
-
ICALL_EXPORT gboolean
ves_icall_Type_get_IsGenericType (MonoReflectionType *type)
{
MonoMethod *method;
MonoType *type = ref_type->type;
- if (type->byref || (type->type != MONO_TYPE_MVAR && type->type != MONO_TYPE_VAR))
- mono_raise_exception (mono_get_exception_invalid_operation ("DeclaringMethod can only be used on generic arguments"));
+ if (type->byref || (type->type != MONO_TYPE_MVAR && type->type != MONO_TYPE_VAR)) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation ("DeclaringMethod can only be used on generic arguments"));
+ return NULL;
+ }
if (type->type == MONO_TYPE_VAR)
return NULL;
}
if (!import || !scope) {
- mono_raise_exception (mono_get_exception_argument ("method", "System.Reflection.Emit method with invalid pinvoke information"));
+ mono_set_pending_exception (mono_get_exception_argument ("method", "System.Reflection.Emit method with invalid pinvoke information"));
return NULL;
}
}
#endif
static guint64
-read_enum_value (char *mem, int type)
+read_enum_value (const char *mem, int type)
{
switch (type) {
case MONO_TYPE_BOOLEAN:
return *(gint8*)mem;
case MONO_TYPE_CHAR:
case MONO_TYPE_U2:
- return *(guint16*)mem;
+ return read16 (mem);
case MONO_TYPE_I2:
- return *(gint16*)mem;
+ return (gint16) read16 (mem);
case MONO_TYPE_U4:
- return *(guint32*)mem;
+ return read32 (mem);
case MONO_TYPE_I4:
- return *(gint32*)mem;
+ return (gint32) read32 (mem);
case MONO_TYPE_U8:
- return *(guint64*)mem;
case MONO_TYPE_I8:
- return *(gint64*)mem;
+ return read64 (mem);
default:
g_assert_not_reached ();
}
}
ICALL_EXPORT MonoObject *
-ves_icall_System_Enum_ToObject (MonoReflectionType *enumType, MonoObject *value)
+ves_icall_System_Enum_ToObject (MonoReflectionType *enumType, guint64 value)
{
MonoDomain *domain;
- MonoClass *enumc, *objc;
+ MonoClass *enumc;
MonoObject *res;
MonoType *etype;
- guint64 val;
-
- MONO_CHECK_ARG_NULL (enumType);
- MONO_CHECK_ARG_NULL (value);
domain = mono_object_domain (enumType);
enumc = mono_class_from_mono_type (enumType->type);
mono_class_init_or_throw (enumc);
- objc = value->vtable->klass;
-
- if (!enumc->enumtype)
- mono_raise_exception (mono_get_exception_argument ("enumType", "Type provided must be an Enum."));
- if (!((objc->enumtype) || (objc->byval_arg.type >= MONO_TYPE_BOOLEAN && objc->byval_arg.type <= MONO_TYPE_U8)))
- mono_raise_exception (mono_get_exception_argument ("value", "The value passed in must be an enum base or an underlying type for an enum, such as an Int32."));
-
etype = mono_class_enum_basetype (enumc);
- if (!etype)
- /* MS throws this for typebuilders */
- mono_raise_exception (mono_get_exception_argument ("Type must be a type provided by the runtime.", "enumType"));
res = mono_object_new (domain, enumc);
- val = read_enum_value ((char *)value + sizeof (MonoObject), objc->enumtype? mono_class_enum_basetype (objc)->type: objc->byval_arg.type);
- write_enum_value ((char *)res + sizeof (MonoObject), etype->type, val);
+ write_enum_value ((char *)res + sizeof (MonoObject), etype->type, value);
return res;
}
mono_class_init_or_throw (klass);
etype = mono_class_enum_basetype (klass);
- if (!etype)
- /* MS throws this for typebuilders */
- mono_raise_exception (mono_get_exception_argument ("Type must be a type provided by the runtime.", "enumType"));
+ if (!etype) {
+ mono_set_pending_exception (mono_get_exception_argument ("enumType", "Type provided must be an Enum."));
+ return NULL;
+ }
return mono_type_get_object (mono_object_domain (type), etype);
}
MonoType *basetype = mono_class_enum_basetype (this->vtable->klass);
g_assert (basetype);
+ if (other == NULL)
+ return 1;
+
+ if (this->vtable->klass != other->vtable->klass)
+ return 2;
+
#define COMPARE_ENUM_VALUES(ENUM_TYPE) do { \
ENUM_TYPE me = *((ENUM_TYPE*)tdata); \
ENUM_TYPE other = *((ENUM_TYPE*)odata); \
case MONO_TYPE_I8:
COMPARE_ENUM_VALUES (gint64);
default:
- g_error ("Implement type 0x%02x in get_hashcode", basetype->type);
+ break;
}
#undef COMPARE_ENUM_VALUES
- return 0;
+ /* indicates that the enum was of an unsupported unerlying type */
+ return 3;
}
ICALL_EXPORT int
return 0;
}
-ICALL_EXPORT void
-ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info)
+ICALL_EXPORT MonoBoolean
+ves_icall_System_Enum_GetEnumValuesAndNames (MonoReflectionType *type, MonoArray **values, MonoArray **names)
{
MonoDomain *domain = mono_object_domain (type);
MonoClass *enumc = mono_class_from_mono_type (type->type);
- guint j = 0, nvalues, crow;
+ guint j = 0, nvalues;
gpointer iter;
MonoClassField *field;
+ int base_type;
+ guint64 field_value, previous_value = 0;
+ gboolean sorted = TRUE;
mono_class_init_or_throw (enumc);
- MONO_STRUCT_SETREF (info, utype, mono_type_get_object (domain, mono_class_enum_basetype (enumc)));
+ if (!enumc->enumtype) {
+ mono_set_pending_exception (mono_get_exception_argument ("enumType", "Type provided must be an Enum."));
+ return TRUE;
+ }
+
+ base_type = mono_class_enum_basetype (enumc)->type;
+
nvalues = mono_class_num_fields (enumc) ? mono_class_num_fields (enumc) - 1 : 0;
- MONO_STRUCT_SETREF (info, names, mono_array_new (domain, mono_defaults.string_class, nvalues));
- MONO_STRUCT_SETREF (info, values, mono_array_new (domain, enumc, nvalues));
+ *names = mono_array_new (domain, mono_defaults.string_class, nvalues);
+ *values = mono_array_new (domain, mono_defaults.uint64_class, nvalues);
- crow = -1;
iter = NULL;
while ((field = mono_class_get_fields (enumc, &iter))) {
const char *p;
- int len;
MonoTypeEnum def_type;
-
+
if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
continue;
if (strcmp ("value__", mono_field_get_name (field)) == 0)
continue;
if (mono_field_is_deleted (field))
continue;
- mono_array_setref (info->names, j, mono_string_new (domain, mono_field_get_name (field)));
+ mono_array_setref (*names, j, mono_string_new (domain, mono_field_get_name (field)));
p = mono_class_get_field_default_value (field, &def_type);
- len = mono_metadata_decode_blob_size (p, &p);
- switch (mono_class_enum_basetype (enumc)->type) {
- case MONO_TYPE_U1:
- case MONO_TYPE_I1:
- mono_array_set (info->values, gchar, j, *p);
- break;
- case MONO_TYPE_CHAR:
- case MONO_TYPE_U2:
- case MONO_TYPE_I2:
- mono_array_set (info->values, gint16, j, read16 (p));
- break;
- case MONO_TYPE_U4:
- case MONO_TYPE_I4:
- mono_array_set (info->values, gint32, j, read32 (p));
- break;
- case MONO_TYPE_U8:
- case MONO_TYPE_I8:
- mono_array_set (info->values, gint64, j, read64 (p));
- break;
- default:
- g_error ("Implement type 0x%02x in get_enum_info", mono_class_enum_basetype (enumc)->type);
- }
+ /* len = */ mono_metadata_decode_blob_size (p, &p);
+
+ field_value = read_enum_value (p, base_type);
+ mono_array_set (*values, guint64, j, field_value);
+
+ if (previous_value > field_value)
+ sorted = FALSE;
+
+ previous_value = field_value;
++j;
}
+
+ return sorted;
}
enum {
BFLAGS_OptionalParamBinding = 0x40000
};
-ICALL_EXPORT MonoReflectionField *
-ves_icall_Type_GetField (MonoReflectionType *type, MonoString *name, guint32 bflags)
-{
- MonoDomain *domain;
- MonoClass *startklass, *klass;
- int match;
- MonoClassField *field;
- gpointer iter;
- char *utf8_name;
- int (*compare_func) (const char *s1, const char *s2) = NULL;
- domain = ((MonoObject *)type)->vtable->domain;
- klass = startklass = mono_class_from_mono_type (type->type);
-
- if (!name)
- mono_raise_exception (mono_get_exception_argument_null ("name"));
- if (type->type->byref)
- return NULL;
-
- compare_func = (bflags & BFLAGS_IgnoreCase) ? mono_utf8_strcasecmp : strcmp;
-
-handle_parent:
- if (klass->exception_type != MONO_EXCEPTION_NONE)
- mono_raise_exception (mono_class_get_exception_for_failure (klass));
-
- iter = NULL;
- while ((field = mono_class_get_fields_lazy (klass, &iter))) {
- guint32 flags = mono_field_get_flags (field);
- match = 0;
-
- if (mono_field_is_deleted_with_flags (field, flags))
- continue;
- if ((flags & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) == FIELD_ATTRIBUTE_PUBLIC) {
- if (bflags & BFLAGS_Public)
- match++;
- } else if ((klass == startklass) || (flags & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) != FIELD_ATTRIBUTE_PRIVATE) {
- if (bflags & BFLAGS_NonPublic) {
- match++;
- }
- }
- if (!match)
- continue;
- match = 0;
- if (flags & FIELD_ATTRIBUTE_STATIC) {
- if (bflags & BFLAGS_Static)
- if ((bflags & BFLAGS_FlattenHierarchy) || (klass == startklass))
- match++;
- } else {
- if (bflags & BFLAGS_Instance)
- match++;
- }
-
- if (!match)
- continue;
-
- utf8_name = mono_string_to_utf8 (name);
-
- if (compare_func (mono_field_get_name (field), utf8_name)) {
- g_free (utf8_name);
- continue;
- }
- g_free (utf8_name);
-
- return mono_field_get_object (domain, klass, field);
- }
- if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
- goto handle_parent;
-
- return NULL;
-}
-
ICALL_EXPORT MonoArray*
-ves_icall_Type_GetFields_internal (MonoReflectionType *type, guint32 bflags, MonoReflectionType *reftype)
+ves_icall_Type_GetFields_internal (MonoReflectionType *type, MonoString *name, guint32 bflags, MonoReflectionType *reftype)
{
MonoDomain *domain;
MonoClass *startklass, *klass, *refklass;
MonoObject *member;
int i, match;
gpointer iter;
+ char *utf8_name = NULL;
+ int (*compare_func) (const char *s1, const char *s2) = NULL;
MonoClassField *field;
MonoPtrArray tmp_array;
domain = ((MonoObject *)type)->vtable->domain;
if (type->type->byref)
return mono_array_new (domain, mono_defaults.field_info_class, 0);
+
klass = startklass = mono_class_from_mono_type (type->type);
refklass = mono_class_from_mono_type (reftype->type);
handle_parent:
if (klass->exception_type != MONO_EXCEPTION_NONE) {
mono_ptr_array_destroy (tmp_array);
- mono_raise_exception (mono_class_get_exception_for_failure (klass));
+ mono_set_pending_exception (mono_class_get_exception_for_failure (klass));
+ return NULL;
}
iter = NULL;
if (!match)
continue;
+
+ if (name != NULL) {
+ if (utf8_name == NULL) {
+ utf8_name = mono_string_to_utf8 (name);
+ compare_func = (bflags & BFLAGS_IgnoreCase) ? mono_utf8_strcasecmp : strcmp;
+ }
+
+ if (compare_func (mono_field_get_name (field), utf8_name))
+ continue;
+ }
+
member = (MonoObject*)mono_field_get_object (domain, refklass, field);
mono_ptr_array_append (tmp_array, member);
}
mono_ptr_array_destroy (tmp_array);
+ if (utf8_name != NULL)
+ g_free (utf8_name);
+
return res;
}
MonoClass *startklass;
MonoMethod *method;
gpointer iter;
- int len, match, nslots;
+ int match, nslots;
/*FIXME, use MonoBitSet*/
guint32 method_slots_default [8];
guint32 *method_slots = NULL;
startklass = klass;
*ex = NULL;
- len = 0;
if (name != NULL)
compare_func = (ignore_case) ? mono_utf8_strcasecmp : strcmp;
method_array = mono_class_get_methods_by_name (klass, mname, bflags, ignore_case, FALSE, &ex);
g_free ((char*)mname);
- if (ex)
- mono_raise_exception (ex);
+ if (ex) {
+ mono_set_pending_exception (ex);
+ return NULL;
+ }
res = mono_array_new_specific (array_vtable, method_array->len);
-
for (i = 0; i < method_array->len; ++i) {
MonoMethod *method = g_ptr_array_index (method_array, i);
mono_array_setref (res, i, mono_method_get_object (domain, method, refklass));
mono_defaults.corlib, "System.Reflection", "ConstructorInfo");
mono_class_setup_methods (klass);
- if (klass->exception_type != MONO_EXCEPTION_NONE)
- mono_raise_exception (mono_class_get_exception_for_failure (klass));
-
+ if (klass->exception_type != MONO_EXCEPTION_NONE) {
+ mono_set_pending_exception (mono_class_get_exception_for_failure (klass));
+ return NULL;
+ }
iter = NULL;
while ((method = mono_class_get_methods (klass, &iter))) {
ex = mono_loader_error_prepare_exception (mono_loader_get_last_error ());
mono_loader_clear_error ();
}
- mono_raise_exception (ex);
- return NULL;
-}
-
-ICALL_EXPORT MonoReflectionEvent *
-ves_icall_MonoType_GetEvent (MonoReflectionType *type, MonoString *name, guint32 bflags)
-{
- MonoDomain *domain;
- MonoClass *klass, *startklass;
- gpointer iter;
- MonoEvent *event;
- MonoMethod *method;
- gchar *event_name;
- int (*compare_func) (const char *s1, const char *s2);
-
- event_name = mono_string_to_utf8 (name);
- if (type->type->byref)
- return NULL;
- klass = startklass = mono_class_from_mono_type (type->type);
- domain = mono_object_domain (type);
-
- mono_class_init_or_throw (klass);
-
- compare_func = (bflags & BFLAGS_IgnoreCase) ? mono_utf8_strcasecmp : strcmp;
-handle_parent:
- if (klass->exception_type != MONO_EXCEPTION_NONE)
- mono_raise_exception (mono_class_get_exception_for_failure (klass));
-
- iter = NULL;
- while ((event = mono_class_get_events (klass, &iter))) {
- if (compare_func (event->name, event_name))
- continue;
-
- method = event->add;
- if (!method)
- method = event->remove;
- if (!method)
- method = event->raise;
- if (method) {
- if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
- if (!(bflags & BFLAGS_Public))
- continue;
- } else {
- if (!(bflags & BFLAGS_NonPublic))
- continue;
- if ((klass != startklass) && (method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PRIVATE)
- continue;
- }
-
- if (method->flags & METHOD_ATTRIBUTE_STATIC) {
- if (!(bflags & BFLAGS_Static))
- continue;
- if (!(bflags & BFLAGS_FlattenHierarchy) && (klass != startklass))
- continue;
- } else {
- if (!(bflags & BFLAGS_Instance))
- continue;
- }
- } else
- if (!(bflags & BFLAGS_NonPublic))
- continue;
-
- g_free (event_name);
- return mono_event_get_object (domain, startklass, event);
- }
-
- if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
- goto handle_parent;
-
- g_free (event_name);
+ mono_set_pending_exception (ex);
return NULL;
}
}
ICALL_EXPORT MonoArray*
-ves_icall_Type_GetEvents_internal (MonoReflectionType *type, guint32 bflags, MonoReflectionType *reftype)
+ves_icall_Type_GetEvents_internal (MonoReflectionType *type, MonoString *name, guint32 bflags, MonoReflectionType *reftype)
{
MonoException *ex;
MonoDomain *domain;
MonoEvent *event;
int i, match;
gpointer iter;
+ char *utf8_name = NULL;
+ int (*compare_func) (const char *s1, const char *s2) = NULL;
GHashTable *events = NULL;
MonoPtrArray tmp_array;
if (!match)
continue;
+ if (name != NULL) {
+ if (utf8_name == NULL) {
+ utf8_name = mono_string_to_utf8 (name);
+ compare_func = (bflags & BFLAGS_IgnoreCase) ? mono_utf8_strcasecmp : strcmp;
+ }
+
+ if (compare_func (event->name, utf8_name))
+ continue;
+ }
+
if (g_hash_table_lookup (events, event))
continue;
mono_ptr_array_destroy (tmp_array);
+ if (utf8_name != NULL)
+ g_free (utf8_name);
+
return res;
loader_error:
ex = mono_loader_error_prepare_exception (mono_loader_get_last_error ());
mono_loader_clear_error ();
}
- mono_raise_exception (ex);
- return NULL;
-}
-
-ICALL_EXPORT MonoReflectionType *
-ves_icall_Type_GetNestedType (MonoReflectionType *type, MonoString *name, guint32 bflags)
-{
- MonoDomain *domain;
- MonoClass *klass;
- MonoClass *nested;
- char *str;
- gpointer iter;
-
- if (name == NULL)
- mono_raise_exception (mono_get_exception_argument_null ("name"));
-
- domain = ((MonoObject *)type)->vtable->domain;
- if (type->type->byref)
- return NULL;
- klass = mono_class_from_mono_type (type->type);
-
- str = mono_string_to_utf8 (name);
-
- handle_parent:
- if (klass->exception_type != MONO_EXCEPTION_NONE)
- mono_raise_exception (mono_class_get_exception_for_failure (klass));
-
- /*
- * If a nested type is generic, return its generic type definition.
- * Note that this means that the return value is essentially a
- * nested type of the generic type definition of @klass.
- *
- * A note in MSDN claims that a generic type definition can have
- * nested types that aren't generic. In any case, the container of that
- * nested type would be the generic type definition.
- */
- if (klass->generic_class)
- klass = klass->generic_class->container_class;
-
- iter = NULL;
- while ((nested = mono_class_get_nested_types (klass, &iter))) {
- int match = 0;
- if ((nested->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK) == TYPE_ATTRIBUTE_NESTED_PUBLIC) {
- if (bflags & BFLAGS_Public)
- match++;
- } else {
- if (bflags & BFLAGS_NonPublic)
- match++;
- }
- if (!match)
- continue;
- if (strcmp (nested->name, str) == 0){
- g_free (str);
- return mono_type_get_object (domain, &nested->byval_arg);
- }
- }
- if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
- goto handle_parent;
- g_free (str);
+ mono_set_pending_exception (ex);
return NULL;
}
ICALL_EXPORT MonoArray*
-ves_icall_Type_GetNestedTypes (MonoReflectionType *type, guint32 bflags)
+ves_icall_Type_GetNestedTypes (MonoReflectionType *type, MonoString *name, guint32 bflags)
{
MonoDomain *domain;
MonoClass *klass;
int i, match;
MonoClass *nested;
gpointer iter;
+ char *str = NULL;
MonoPtrArray tmp_array;
domain = ((MonoObject *)type)->vtable->domain;
}
if (!match)
continue;
+
+ if (name != NULL) {
+ if (str == NULL)
+ str = mono_string_to_utf8 (name);
+
+ if (strcmp (nested->name, str))
+ continue;
+ }
+
member = (MonoObject*)mono_type_get_object (domain, &nested->byval_arg);
mono_ptr_array_append (tmp_array, member);
}
mono_ptr_array_destroy (tmp_array);
+ if (!str)
+ g_free (str);
+
return res;
}
if (!mono_reflection_parse_type (str, &info)) {
g_free (str);
mono_reflection_free_type_info (&info);
- if (throwOnError) /* uhm: this is a parse error, though... */
- mono_raise_exception (mono_get_exception_type_load (name, NULL));
+ if (throwOnError) {
+ /* uhm: this is a parse error, though... */
+ mono_set_pending_exception (mono_get_exception_type_load (name, NULL));
+ return NULL;
+ }
/*g_print ("failed parse\n");*/
return NULL;
}
if (throwOnError) {
/* 1.0 and 2.0 throw different exceptions */
if (mono_defaults.generic_ilist_class)
- mono_raise_exception (mono_get_exception_argument (NULL, "Type names passed to Assembly.GetType() must not specify an assembly."));
+ mono_set_pending_exception (mono_get_exception_argument (NULL, "Type names passed to Assembly.GetType() must not specify an assembly."));
else
- mono_raise_exception (mono_get_exception_type_load (name, NULL));
+ mono_set_pending_exception (mono_get_exception_type_load (name, NULL));
+ return NULL;
}
return NULL;
}
mono_loader_clear_error ();
if (e != NULL)
- mono_raise_exception (e);
-
+ mono_set_pending_exception (e);
return NULL;
} else if (mono_loader_get_last_error ()) {
- if (throwOnError)
- mono_raise_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
+ if (throwOnError) {
+ mono_set_pending_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
+ return NULL;
+ }
mono_loader_clear_error ();
}
/* report SecurityException (or others) that occured when loading the assembly */
MonoException *exc = mono_class_get_exception_for_failure (klass);
mono_loader_clear_error ();
- mono_raise_exception (exc);
+ mono_set_pending_exception (exc);
+ return NULL;
} else if (mono_security_enabled () && klass->exception_type == MONO_EXCEPTION_SECURITY_INHERITANCEDEMAND) {
return NULL;
}
char *msg = g_strdup_printf ("Assembly %d referenced from assembly %s not found ", i - 1, assembly->assembly->image->name);
MonoException *ex = mono_get_exception_file_not_found2 (msg, NULL);
g_free (msg);
- mono_raise_exception (ex);
+ mono_set_pending_exception (ex);
+ return FALSE;
}
MONO_OBJECT_SETREF (info, assembly, mono_assembly_get_object (mono_domain_get (), assembly->assembly->image->references [i - 1]));
MonoImage *m = mono_image_load_file_for_image (image, i + 1);
if (!m) {
MonoString *fname = mono_string_new (mono_domain_get (), mono_metadata_string_heap (image, cols [MONO_FILE_NAME]));
- mono_raise_exception (mono_get_exception_file_not_found2 (NULL, fname));
+ mono_set_pending_exception (mono_get_exception_file_not_found2 (NULL, fname));
+ return NULL;
}
mono_array_setref (res, j, mono_module_get_object (domain, m));
}
return mono_security_core_clr_class_level (klass);
}
+ICALL_EXPORT int
+ves_icall_MonoField_get_core_clr_security_level (MonoReflectionField *this)
+{
+ MonoClassField *field = this->field;
+ return mono_security_core_clr_field_level (field, TRUE);
+}
+
+ICALL_EXPORT int
+ves_icall_MonoMethod_get_core_clr_security_level (MonoReflectionMethod *this)
+{
+ MonoMethod *method = this->method;
+ return mono_security_core_clr_method_level (method, TRUE);
+}
+
static void
fill_reflection_assembly_name (MonoDomain *domain, MonoReflectionAssemblyName *aname, MonoAssemblyName *name, const char *absolute, gboolean by_default_version, gboolean default_publickey, gboolean default_token)
{
exc = mono_get_exception_bad_image_format2 (NULL, fname);
else
exc = mono_get_exception_file_not_found2 (NULL, fname);
- mono_raise_exception (exc);
+ mono_set_pending_exception (exc);
+ return;
}
res = mono_assembly_fill_assembly_name (image, &name);
if (!res) {
mono_image_close (image);
g_free (filename);
- mono_raise_exception (mono_get_exception_argument ("assemblyFile", "The file does not contain a manifest"));
+ mono_set_pending_exception (mono_get_exception_argument ("assemblyFile", "The file does not contain a manifest"));
+ return;
}
fill_reflection_assembly_name (mono_domain_get (), aname, &name, filename,
return result;
}
+static gboolean
+mono_module_type_is_visible (MonoTableInfo *tdef, MonoImage *image, int type)
+{
+ guint32 attrs, visibility;
+ do {
+ attrs = mono_metadata_decode_row_col (tdef, type - 1, MONO_TYPEDEF_FLAGS);
+ visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK;
+ if (visibility != TYPE_ATTRIBUTE_PUBLIC && visibility != TYPE_ATTRIBUTE_NESTED_PUBLIC)
+ return FALSE;
+
+ } while ((type = mono_metadata_token_index (mono_metadata_nested_in_typedef (image, type))));
+
+ return TRUE;
+}
+
static MonoArray*
mono_module_get_types (MonoDomain *domain, MonoImage *image, MonoArray **exceptions, MonoBoolean exportedOnly)
{
MonoClass *klass;
MonoTableInfo *tdef = &image->tables [MONO_TABLE_TYPEDEF];
int i, count;
- guint32 attrs, visibility;
/* we start the count from 1 because we skip the special type <Module> */
if (exportedOnly) {
count = 0;
for (i = 1; i < tdef->rows; ++i) {
- attrs = mono_metadata_decode_row_col (tdef, i, MONO_TYPEDEF_FLAGS);
- visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK;
- if (visibility == TYPE_ATTRIBUTE_PUBLIC || visibility == TYPE_ATTRIBUTE_NESTED_PUBLIC)
+ if (mono_module_type_is_visible (tdef, image, i + 1))
count++;
}
} else {
*exceptions = mono_array_new (domain, mono_defaults.exception_class, count);
count = 0;
for (i = 1; i < tdef->rows; ++i) {
- attrs = mono_metadata_decode_row_col (tdef, i, MONO_TYPEDEF_FLAGS);
- visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK;
- if (!exportedOnly || (visibility == TYPE_ATTRIBUTE_PUBLIC || visibility == TYPE_ATTRIBUTE_NESTED_PUBLIC)) {
+ if (!exportedOnly || mono_module_type_is_visible (tdef, image, i + 1)) {
MonoError error;
klass = mono_class_get_checked (image, (i + 1) | MONO_TOKEN_TYPE_DEF, &error);
g_assert (!mono_loader_get_last_error ()); /* Plug any leaks */
exc = mono_get_exception_reflection_type_load (res, exl);
mono_loader_clear_error ();
- mono_raise_exception (exc);
+ mono_set_pending_exception (exc);
+ return NULL;
}
return res;
MonoArray *res = mono_module_get_types (mono_object_domain (module), module->image, &exceptions, FALSE);
for (i = 0; i < mono_array_length (exceptions); ++i) {
MonoException *ex = mono_array_get (exceptions, MonoException *, i);
- if (ex)
- mono_raise_exception (ex);
+ if (ex) {
+ mono_set_pending_exception (ex);
+ return NULL;
+ }
}
return res;
}
gmtoff_st = gmtoff_ds = transitioned = 0;
- MONO_CHECK_ARG_NULL (data);
- MONO_CHECK_ARG_NULL (names);
+ MONO_CHECK_ARG_NULL (data, 0);
+ MONO_CHECK_ARG_NULL (names, 0);
mono_gc_wbarrier_generic_store (data, (MonoObject*) mono_array_new (domain, mono_defaults.int64_class, 4));
mono_gc_wbarrier_generic_store (names, (MonoObject*) mono_array_new (domain, mono_defaults.string_class, 2));
}
transitioned++;
} else {
- time_t te;
- te = mktime (&tt);
-
mono_array_setref ((*names), 0, mono_string_new (domain, tzone));
mono_array_set ((*data), gint64, 1, ((gint64)t1 + EPOCH_ADJUST) * 10000000L);
if (gmtoff_ds == 0) {
if (tz_id == TIME_ZONE_ID_INVALID)
return 0;
- MONO_CHECK_ARG_NULL (data);
- MONO_CHECK_ARG_NULL (names);
+ MONO_CHECK_ARG_NULL (data, 0);
+ MONO_CHECK_ARG_NULL (names, 0);
mono_gc_wbarrier_generic_store (data, mono_array_new (domain, mono_defaults.int64_class, 4));
mono_gc_wbarrier_generic_store (names, mono_array_new (domain, mono_defaults.string_class, 2));
guint8 *src_buf, *dest_buf;
/* This is called directly from the class libraries without going through the managed wrapper */
- MONO_CHECK_ARG_NULL (src);
- MONO_CHECK_ARG_NULL (dest);
+ MONO_CHECK_ARG_NULL (src, FALSE);
+ MONO_CHECK_ARG_NULL (dest, FALSE);
/* watch out for integer overflow */
if ((src_offset > mono_array_get_byte_length (src) - count) || (dest_offset > mono_array_get_byte_length (dest) - count))
*/
#ifndef _MSC_VER
#ifndef __MINGW32_VERSION
-#if defined(__APPLE__) && !defined (__arm__)
+#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
/* Apple defines this in crt_externs.h but doesn't provide that header for
* arm-apple-darwin9. We'll manually define the symbol on Apple as it does
* in fact exist on all implementations (so far)
* returns the code page as a string
*/
ICALL_EXPORT MonoString*
-ves_icall_System_Text_Encoding_InternalCodePage (gint32 *int_code_page)
+ves_icall_System_Text_EncodingHelper_InternalCodePage (gint32 *int_code_page)
{
const char *cset;
const char *p;
MonoMethod **vtable;
MonoMethod *res = NULL;
- MONO_CHECK_ARG_NULL (rtype);
- MONO_CHECK_ARG_NULL (rmethod);
+ MONO_CHECK_ARG_NULL (rtype, NULL);
+ MONO_CHECK_ARG_NULL (rmethod, NULL);
method = rmethod->method;
klass = mono_class_from_mono_type (rtype->type);
klass = mono_class_from_mono_type (type->type);
mono_class_init_or_throw (klass);
- if (MONO_CLASS_IS_INTERFACE (klass) || (klass->flags & TYPE_ATTRIBUTE_ABSTRACT))
- mono_raise_exception (mono_get_exception_argument ("type", "Type cannot be instantiated"));
+ if (MONO_CLASS_IS_INTERFACE (klass) || (klass->flags & TYPE_ATTRIBUTE_ABSTRACT)) {
+ mono_set_pending_exception (mono_get_exception_argument ("type", "Type cannot be instantiated"));
+ return NULL;
+ }
if (klass->rank >= 1) {
g_assert (klass->rank == 1);
MonoException *ex = mono_get_exception_not_supported (msg);
g_free (type_name);
g_free (msg);
- mono_raise_exception (ex);
+ mono_set_pending_exception (ex);
+ return NULL;
}
image = method->klass->image;
mono_class_init (prop->parent);
- if (!(prop->attrs & PROPERTY_ATTRIBUTE_HAS_DEFAULT))
- mono_raise_exception (mono_get_exception_invalid_operation (NULL));
+ if (!(prop->attrs & PROPERTY_ATTRIBUTE_HAS_DEFAULT)) {
+ mono_set_pending_exception (mono_get_exception_invalid_operation (NULL));
+ return NULL;
+ }
def_value = mono_class_get_property_default_value (prop, &def_type);
mono_error_raise_exception (&error);
if (mono_loader_get_last_error ()) {
- mono_raise_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
- g_assert_not_reached ();
- /* Not reached */
+ mono_set_pending_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
return NULL;
} else {
return res;
return message;
}
+ICALL_EXPORT int
+ves_icall_System_StackFrame_GetILOffsetFromFile (MonoString *path, int methodToken, int nativeOffset)
+{
+ guint32 il_offset;
+ char *path_str = mono_string_to_utf8 (path);
+
+ if (!seq_point_data_get_il_offset (path_str, methodToken, nativeOffset, &il_offset))
+ il_offset = -1;
+
+ g_free (path_str);
+
+ return il_offset;
+}
+
#ifndef DISABLE_ICALL_TABLES
#define ICALL_TYPE(id,name,first)
mono_icall_unlock ();
}
+/*
+ * If NO_RAISE is set, that means the icall is not calling mono_raise_exception () directly or indirectly. The JIT might be able to call these
+ * icalls without wrappers in some cases.
+ */
MonoJitICallInfo *
-mono_register_jit_icall_full (gconstpointer func, const char *name, MonoMethodSignature *sig, gboolean is_save, const char *c_symbol)
+mono_register_jit_icall_full (gconstpointer func, const char *name, MonoMethodSignature *sig, gboolean is_save, gboolean no_raise, const char *c_symbol)
{
MonoJitICallInfo *info;
info->func = func;
info->sig = sig;
info->c_symbol = c_symbol;
+ info->no_raise = no_raise;
if (is_save) {
info->wrapper = func;
MonoJitICallInfo *
mono_register_jit_icall (gconstpointer func, const char *name, MonoMethodSignature *sig, gboolean is_save)
{
- return mono_register_jit_icall_full (func, name, sig, is_save, NULL);
+ return mono_register_jit_icall_full (func, name, sig, is_save, FALSE, NULL);
}
projects / mono.git / blobdiff