mono_native_tls_alloc (&loader_error_thread_id, NULL);
mono_native_tls_alloc (&loader_lock_nest_id, NULL);
+ mono_counters_init ();
mono_counters_register ("Inflated signatures size",
MONO_COUNTER_GENERICS | MONO_COUNTER_INT, &inflated_signatures_size);
mono_counters_register ("Memberref signature cache size",
return (MonoLoaderError*)mono_native_tls_get_value (loader_error_thread_id);
}
+void
+mono_loader_assert_no_error (void)
+{
+ MonoLoaderError *error = mono_loader_get_last_error ();
+
+ if (error) {
+ g_print ("Unhandled loader error: %x, %s %s %s\n", error->exception_type, error->msg, error->assembly_name, error->class_name);
+ g_assert_not_reached ();
+ }
+}
+
/**
* mono_loader_clear_error:
*
MonoTableInfo *tables = image->tables;
MonoType *sig_type;
guint32 cols[6];
- guint32 nindex, class, class_table;
+ guint32 nindex, class;
const char *fname;
const char *ptr;
guint32 idx = mono_metadata_token_index (token);
switch (class) {
case MONO_MEMBERREF_PARENT_TYPEDEF:
- class_table = MONO_TOKEN_TYPE_DEF;
klass = mono_class_get_checked (image, MONO_TOKEN_TYPE_DEF | nindex, error);
break;
case MONO_MEMBERREF_PARENT_TYPEREF:
- class_table = MONO_TOKEN_TYPE_REF;
klass = mono_class_from_typeref_checked (image, MONO_TOKEN_TYPE_REF | nindex, error);
break;
case MONO_MEMBERREF_PARENT_TYPESPEC:
- class_table = MONO_TOKEN_TYPE_SPEC;
klass = mono_class_get_and_inflate_typespec_checked (image, MONO_TOKEN_TYPE_SPEC | nindex, context, error);
break;
default:
field = mono_class_get_field_from_name_full (klass, fname, sig_type);
if (!field) {
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
mono_error_set_field_load (error, klass, fname, "Could not find field '%s'", fname);
}
{
MonoError error;
MonoClassField *res = mono_field_from_token_checked (image, token, retklass, context, &error);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
if (!mono_error_ok (&error)) {
mono_loader_set_error_from_mono_error (&error);
mono_error_cleanup (&error);
if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
field = field_from_memberref (image, token, retklass, context, error);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
} else {
type = mono_metadata_typedef_from_field (image, mono_metadata_token_index (token));
if (!type) {
}
}
- if (field && field->parent && !field->parent->generic_class && !field->parent->generic_container)
+ if (field && field->parent && !field->parent->generic_class && !field->parent->generic_container) {
+ mono_image_lock (image);
mono_conc_hashtable_insert (image->field_cache, GUINT_TO_POINTER (token), field);
+ mono_image_unlock (image);
+ }
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
return field;
}
static MonoMethod *
find_method_in_class (MonoClass *klass, const char *name, const char *qname, const char *fqname,
- MonoMethodSignature *sig, MonoClass *from_class)
+ MonoMethodSignature *sig, MonoClass *from_class, MonoError *error)
{
int i;
/* Search directly in the metadata to avoid calling setup_methods () */
+ mono_error_init (error);
/* FIXME: !from_class->generic_class condition causes test failures. */
if (klass->type_token && !image_is_dynamic (klass->image) && !klass->methods && !klass->rank && klass == from_class && !from_class->generic_class) {
(name && !strcmp (m_name, name))))
continue;
- method = mono_get_method (klass->image, MONO_TOKEN_METHOD_DEF | (klass->method.first + i + 1), klass);
+ method = mono_get_method_checked (klass->image, MONO_TOKEN_METHOD_DEF | (klass->method.first + i + 1), klass, NULL, error);
+ if (!mono_error_ok (error)) //bail out if we hit a loader error
+ return NULL;
if (method) {
- other_sig = mono_method_signature (method);
+ other_sig = mono_method_signature_checked (method, error);
+ if (!mono_error_ok (error)) //bail out if we hit a loader error
+ return NULL;
if (other_sig && (sig->call_convention != MONO_CALL_VARARG) && mono_metadata_signature_equal (sig, other_sig))
return method;
}
}
}
- mono_class_setup_methods (klass);
+ mono_class_setup_methods (klass); /* FIXME don't swallow the error here. */
/*
We can't fail lookup of methods otherwise the runtime will fail with MissingMethodException instead of TypeLoadException.
See mono/tests/generic-type-load-exception.2.il
FIXME we should better report this error to the caller
*/
- if (!klass->methods)
+ if (!klass->methods || klass->exception_type) {
+ mono_error_set_type_load_class (error, klass, "Could not find method due to a type load error"); //FIXME get the error from the class
+
return NULL;
+ }
for (i = 0; i < klass->method.count; ++i) {
MonoMethod *m = klass->methods [i];
MonoMethodSignature *msig;
(qname && !strcmp (m->name, qname)) ||
(name && !strcmp (m->name, name))))
continue;
- msig = mono_method_signature (m);
+ msig = mono_method_signature_checked (m, error);
+ if (!mono_error_ok (error)) //bail out if we hit a loader error
+ return NULL;
+
if (!msig)
continue;
}
static MonoMethod *
-find_method (MonoClass *in_class, MonoClass *ic, const char* name, MonoMethodSignature *sig, MonoClass *from_class)
+find_method (MonoClass *in_class, MonoClass *ic, const char* name, MonoMethodSignature *sig, MonoClass *from_class, MonoError *error)
{
int i;
char *qname, *fqname, *class_name;
gboolean is_interface;
MonoMethod *result = NULL;
+ MonoClass *initial_class = in_class;
+ mono_error_init (error);
is_interface = MONO_CLASS_IS_INTERFACE (in_class);
if (ic) {
while (in_class) {
g_assert (from_class);
- result = find_method_in_class (in_class, name, qname, fqname, sig, from_class);
- if (result)
+ result = find_method_in_class (in_class, name, qname, fqname, sig, from_class, error);
+ if (result || !mono_error_ok (error))
goto out;
if (name [0] == '.' && (!strcmp (name, ".ctor") || !strcmp (name, ".cctor")))
else
ic_fqname = NULL;
- result = find_method_in_class (in_ic, ic ? name : NULL, ic_qname, ic_fqname, sig, from_ic);
+ result = find_method_in_class (in_ic, ic ? name : NULL, ic_qname, ic_fqname, sig, from_ic, error);
g_free (ic_class_name);
g_free (ic_fqname);
g_free (ic_qname);
- if (result)
+ if (result || !mono_error_ok (error))
goto out;
}
g_assert (!in_class == !from_class);
if (is_interface)
- result = find_method_in_class (mono_defaults.object_class, name, qname, fqname, sig, mono_defaults.object_class);
+ result = find_method_in_class (mono_defaults.object_class, name, qname, fqname, sig, mono_defaults.object_class, error);
+ //we did not find the method
+ if (!result && mono_error_ok (error)) {
+ char *desc = mono_signature_get_desc (sig, FALSE);
+ mono_error_set_method_load (error, initial_class, name, "Could not find method with signature %s", desc);
+ g_free (desc);
+ }
+
out:
g_free (class_name);
g_free (fqname);
MonoError error;
MonoMethodSignature *res = mono_method_get_signature_checked (method, image, token, context, &error);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
if (!res) {
g_assert (!mono_error_ok (&error));
ptr = mono_metadata_blob_heap (image, sig_idx);
mono_metadata_decode_blob_size (ptr, &ptr);
- /* FIXME make type/signature parsing not produce loader errors */
- sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
- g_assert (!mono_loader_get_last_error ());
- if (!sig) {
- guint32 class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
- const char *fname = mono_metadata_string_heap (image, cols [MONO_MEMBERREF_NAME]);
- //FIXME include the decoding error
- mono_error_set_bad_image (error, image, "Bad method signature class token 0x%08x field name %s token 0x%08x", class, fname, token);
+ sig = mono_metadata_parse_method_signature_full (image, NULL, 0, ptr, NULL, error);
+ if (!sig)
return NULL;
- }
+
sig = cache_memberref_sig (image, sig_idx, sig);
}
/* FIXME: we probably should verify signature compat in the dynamic case too*/
MonoError error;
MonoMethodSignature *res = mono_method_get_signature_checked (method, image, token, NULL, &error);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
if (!res) {
g_assert (!mono_error_ok (&error));
goto fail;
break;
case MONO_MEMBERREF_PARENT_METHODDEF: {
- method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | nindex, NULL);
- if (!method) {
- if (mono_loader_get_last_error ())
- mono_error_set_from_loader_error (error);
- else
- mono_error_set_bad_image (error, image, "Could not resolve memberref 0x%08x parent method token 0x%08x", idx, MONO_TOKEN_METHOD_DEF | nindex);
+ method = mono_get_method_checked (image, MONO_TOKEN_METHOD_DEF | nindex, NULL, NULL, error);
+ if (!method)
goto fail;
- }
return method;
}
default:
sig = find_cached_memberref_sig (image, sig_idx);
if (!sig) {
- sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
- if (sig == NULL) {
- /* FIXME don't swallow parsing error */
- if (mono_loader_get_last_error ()) /* FIXME mono_metadata_parse_method_signature leak a loader error */
- mono_error_set_from_loader_error (error);
- else
- mono_error_set_method_load (error, klass, mname, "Could not parse method signature");
+ sig = mono_metadata_parse_method_signature_full (image, NULL, 0, ptr, NULL, error);
+ if (sig == NULL)
goto fail;
- }
sig = cache_memberref_sig (image, sig_idx, sig);
}
switch (class) {
case MONO_MEMBERREF_PARENT_TYPEREF:
case MONO_MEMBERREF_PARENT_TYPEDEF:
- method = find_method (klass, NULL, mname, sig, klass);
+ method = find_method (klass, NULL, mname, sig, klass, error);
break;
case MONO_MEMBERREF_PARENT_TYPESPEC: {
if (type->type != MONO_TYPE_ARRAY && type->type != MONO_TYPE_SZARRAY) {
MonoClass *in_class = klass->generic_class ? klass->generic_class->container_class : klass;
- method = find_method (in_class, NULL, mname, sig, klass);
+ method = find_method (in_class, NULL, mname, sig, klass, error);
break;
}
goto fail;
}
- if (!method) {
+ if (!method && mono_error_ok (error)) {
char *msig = mono_signature_get_desc (sig, FALSE);
GString *s = g_string_new (mname);
if (sig->generic_param_count)
g_free (msig);
msig = g_string_free (s, FALSE);
- if (mono_loader_get_last_error ()) /* FIXME find_method and mono_method_search_in_array_class can leak a loader error */
- mono_error_set_from_loader_error (error);
- else
- mono_error_set_method_load (error, klass, mname, "Could not find method %s", msig);
+ if (mono_loader_get_last_error ()) /* FIXME find_method and mono_method_search_in_array_class can leak a loader error */
+ mono_error_set_from_loader_error (error);
+ else
+ mono_error_set_method_load (error, klass, mname, "Could not find method %s", msig);
g_free (msig);
}
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
return method;
fail:
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
g_assert (!mono_error_ok (error));
return NULL;
}
inst = mono_metadata_parse_generic_inst (image, NULL, param_count, ptr, &ptr);
if (!inst) {
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
mono_error_set_bad_image (error, image, "Cannot parse generic instance for methodspec 0x%08x", idx);
return NULL;
}
}
if ((token & MONO_METHODDEFORREF_MASK) == MONO_METHODDEFORREF_METHODDEF) {
- method = mono_get_method_full (image, MONO_TOKEN_METHOD_DEF | nindex, NULL, context);
- if (!method) {
- if (mono_loader_get_last_error ())
- mono_error_set_from_loader_error (error);
- else
- mono_error_set_bad_image (error, image, "Could not resolve methodspec 0x%08x methoddef token 0x%08x", idx, MONO_TOKEN_METHOD_DEF | nindex);
- }
+ method = mono_get_method_checked (image, MONO_TOKEN_METHOD_DEF | nindex, NULL, context, error);
+ if (!method)
+ return NULL;
} else {
method = method_from_memberref (image, nindex, context, NULL, error);
}
new_context.method_inst = inst;
method = mono_class_inflate_generic_method_full_checked (method, klass, &new_context, error);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
return method;
}
/*
* Try loading the module using a variety of names
*/
- for (i = 0; i < 4; ++i) {
+ for (i = 0; i < 5; ++i) {
char *base_name = NULL, *dir_name = NULL;
gboolean is_absolute = is_absolute_path (new_scope);
break;
}
continue;
+ case 3:
+ if (!is_absolute && mono_dl_get_system_dir ()) {
+ dir_name = (char*)mono_dl_get_system_dir ();
+ file_name = g_path_get_basename (new_scope);
+ base_name = NULL;
+ } else
+ continue;
+ break;
default:
#ifndef TARGET_WIN32
if (!g_ascii_strcasecmp ("user32.dll", new_scope) ||
"Probing '%s'.", mangled_name2);
error_msg = mono_dl_symbol (module, mangled_name2, &piinfo->addr);
- g_free (error_msg);
- error_msg = NULL;
if (piinfo->addr)
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT,
"Found as '%s'.", mangled_name2);
+ else
+ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT,
+ "Could not find '%s' due to '%s'.", mangled_name2, error_msg);
+
+ g_free (error_msg);
+ error_msg = NULL;
if (mangled_name != mangled_name2)
g_free (mangled_name2);
MonoTableInfo *tables = image->tables;
MonoGenericContainer *generic_container = NULL, *container = NULL;
const char *sig = NULL;
- int size;
guint32 cols [MONO_TYPEDEF_SIZE];
mono_error_init (error);
MonoClass *handle_class;
result = mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
// This checks the memberref type as well
if (result && handle_class != mono_defaults.methodhandle_class) {
if (!sig) /* already taken from the methodref */
sig = mono_metadata_blob_heap (image, cols [4]);
- size = mono_metadata_decode_blob_size (sig, &sig);
+ /* size = */ mono_metadata_decode_blob_size (sig, &sig);
container = klass->generic_container;
*/
if (*sig & 0x10) {
generic_container = mono_metadata_load_generic_params (image, token, container);
- g_assert (!mono_loader_get_last_error ()); /* FIXME don't swallow this error. */
+ mono_loader_assert_no_error (); /* FIXME don't swallow this error. */
}
if (generic_container) {
result->is_generic = TRUE;
if (generic_container)
mono_method_set_generic_container (result, generic_container);
- g_assert (!mono_loader_get_last_error ());
+ mono_loader_assert_no_error ();
return result;
}
MonoGenericContext *context)
{
MonoError error;
+ MonoMethod *result = mono_get_method_checked (image, token, klass, context, &error);
+ mono_loader_assert_no_error ();
+ if (!mono_error_ok (&error)) {
+ mono_loader_set_error_from_mono_error (&error);
+ mono_error_cleanup (&error);
+ }
+ return result;
+}
+
+MonoMethod *
+mono_get_method_checked (MonoImage *image, guint32 token, MonoClass *klass, MonoGenericContext *context, MonoError *error)
+{
MonoMethod *result = NULL;
gboolean used_context = FALSE;
/* We do everything inside the lock to prevent creation races */
+ mono_error_init (error);
+
mono_image_lock (image);
if (mono_metadata_token_table (token) == MONO_TABLE_METHOD) {
return result;
- result = mono_get_method_from_token (image, token, klass, context, &used_context, &error);
- if (!result) {
- mono_loader_set_error_from_mono_error (&error);
- mono_error_cleanup (&error);
+ result = mono_get_method_from_token (image, token, klass, context, &used_context, error);
+ if (!result)
return NULL;
- }
mono_image_lock (image);
if (!used_context && !result->is_inflated) {
if ((constrained_class != method->klass) && (MONO_CLASS_IS_INTERFACE (method->klass)))
ic = method->klass;
- result = find_method (constrained_class, ic, method->name, sig, constrained_class);
+ result = find_method (constrained_class, ic, method->name, sig, constrained_class, error);
if (sig != original_sig)
mono_metadata_free_inflated_signature (sig);
- g_assert (!mono_loader_get_last_error ()); /* in the hopes that find_method don't leak */
- if (!result) {
- char *m = mono_method_full_name (method, 1);
- mono_error_set_method_load (error, constrained_class, method->name, "Could not find contrained method %s", m);
+ if (!result)
return NULL;
- }
if (method_context) {
result = mono_class_inflate_generic_method_checked (result, method_context, error);
return NULL;
}
- g_assert (!mono_loader_get_last_error ());
return result;
}
MonoMethod *
mono_get_method_constrained_with_method (MonoImage *image, MonoMethod *method, MonoClass *constrained_class,
- MonoGenericContext *context)
+ MonoGenericContext *context, MonoError *error)
{
- MonoError error;
- MonoMethod *result;
g_assert (method);
- result = get_method_constrained (image, method, constrained_class, context, &error);
-
- if (!result) {
- mono_loader_set_error_from_mono_error (&error);
- mono_error_cleanup (&error);
- }
- return result;
+ return get_method_constrained (image, method, constrained_class, context, error);
}
/**
MonoGenericContext *context, MonoMethod **cil_method)
{
MonoError error;
- MonoMethod *result;
-
- *cil_method = mono_get_method_from_token (image, token, NULL, context, NULL, &error);
- if (!*cil_method) {
- mono_loader_set_error_from_mono_error (&error);
- mono_error_cleanup (&error);
- return NULL;
- }
+ MonoMethod *result = mono_get_method_constrained_checked (image, token, constrained_class, context, cil_method, &error);
- result = get_method_constrained (image, *cil_method, constrained_class, context, &error);
- if (!result) {
+ mono_loader_assert_no_error ();
+ if (!mono_error_ok (&error)) {
mono_loader_set_error_from_mono_error (&error);
mono_error_cleanup (&error);
}
return result;
}
+MonoMethod *
+mono_get_method_constrained_checked (MonoImage *image, guint32 token, MonoClass *constrained_class, MonoGenericContext *context, MonoMethod **cil_method, MonoError *error)
+{
+ mono_error_init (error);
+
+ *cil_method = mono_get_method_from_token (image, token, NULL, context, NULL, error);
+ if (!*cil_method)
+ return NULL;
+
+ return get_method_constrained (image, *cil_method, constrained_class, context, error);
+}
+
void
mono_free_method (MonoMethod *method)
{
switch (frame->type) {
case FRAME_TYPE_DEBUGGER_INVOKE:
case FRAME_TYPE_MANAGED_TO_NATIVE:
+ case FRAME_TYPE_TRAMPOLINE:
return FALSE;
case FRAME_TYPE_MANAGED:
g_assert (frame->ji);
- return d->func (mono_jit_info_get_method (frame->ji), frame->native_offset, frame->il_offset, frame->managed, d->user_data);
+ return d->func (frame->actual_method, frame->native_offset, frame->il_offset, frame->managed, d->user_data);
break;
default:
g_assert_not_reached ();
switch (frame->type) {
case FRAME_TYPE_DEBUGGER_INVOKE:
case FRAME_TYPE_MANAGED_TO_NATIVE:
+ case FRAME_TYPE_TRAMPOLINE:
return FALSE;
case FRAME_TYPE_MANAGED:
if (!frame->ji)
return FALSE;
- if (frame->ji->async)
+ if (frame->ji->async) {
return d->func (NULL, frame->domain, frame->ji->code_start, frame->native_offset, d->user_data);
- else
- return d->func (mono_jit_info_get_method (frame->ji), frame->domain, frame->ji->code_start, frame->native_offset, d->user_data);
+ } else {
+ return d->func (frame->actual_method, frame->domain, frame->ji->code_start, frame->native_offset, d->user_data);
+ }
break;
default:
g_assert_not_reached ();
void
mono_loader_lock (void)
{
+ MONO_TRY_BLOCKING;
mono_locks_acquire (&loader_mutex, LoaderLock);
+ MONO_FINISH_TRY_BLOCKING;
+
if (G_UNLIKELY (loader_lock_track_ownership)) {
mono_native_tls_set_value (loader_lock_nest_id, GUINT_TO_POINTER (GPOINTER_TO_UINT (mono_native_tls_get_value (loader_lock_nest_id)) + 1));
}
mono_method_signature_checked (MonoMethod *m, MonoError *error)
{
int idx;
- int size;
MonoImage* img;
const char *sig;
gboolean can_cache_signature;
if (!mono_verifier_verify_method_signature (img, sig_offset, error))
return NULL;
- size = mono_metadata_decode_blob_size (sig, &sig_body);
+ /* size = */ mono_metadata_decode_blob_size (sig, &sig_body);
- signature = mono_metadata_parse_method_signature_full (img, container, idx, sig_body, NULL);
- if (!signature) {
- mono_error_set_from_loader_error (error);
+ signature = mono_metadata_parse_method_signature_full (img, container, idx, sig_body, NULL, error);
+ if (!signature)
return NULL;
- }
if (can_cache_signature) {
mono_image_lock (img);
projects / mono.git / blobdiff