void
mono_loader_init ()
{
- InitializeCriticalSection (&loader_mutex);
+ static gboolean inited;
- loader_error_thread_id = TlsAlloc ();
+ if (!inited) {
+ InitializeCriticalSection (&loader_mutex);
+
+ loader_error_thread_id = TlsAlloc ();
+
+ inited = TRUE;
+ }
}
void
MonoGenericContext *context)
{
MonoClass *klass;
- MonoClassField *field;
+ MonoClassField *field, *sig_field = NULL;
MonoTableInfo *tables = image->tables;
+ MonoType *sig_type;
guint32 cols[6];
guint32 nindex, class;
const char *fname;
mono_metadata_decode_blob_size (ptr, &ptr);
/* we may want to check the signature here... */
+ if (*ptr++ != 0x6) {
+ mono_loader_set_error_bad_image (g_strdup_printf ("Bad field signature class token %08x field name %s token %08x", class, fname, token));
+ return NULL;
+ }
+ sig_type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
+
switch (class) {
case MONO_MEMBERREF_PARENT_TYPEDEF:
klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | nindex);
mono_class_init (klass);
if (retklass)
*retklass = klass;
- field = mono_class_get_field_from_name (klass, fname);
+ sig_field = field = mono_class_get_field_from_name (klass, fname);
break;
case MONO_MEMBERREF_PARENT_TYPEREF:
klass = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | nindex);
mono_class_init (klass);
if (retklass)
*retklass = klass;
- field = mono_class_get_field_from_name (klass, fname);
+ sig_field = field = mono_class_get_field_from_name (klass, fname);
break;
case MONO_MEMBERREF_PARENT_TYPESPEC: {
- /*guint32 bcols [MONO_TYPESPEC_SIZE];
- guint32 len;
- MonoType *type;
-
- mono_metadata_decode_row (&tables [MONO_TABLE_TYPESPEC], nindex - 1,
- bcols, MONO_TYPESPEC_SIZE);
- ptr = mono_metadata_blob_heap (image, bcols [MONO_TYPESPEC_SIGNATURE]);
- len = mono_metadata_decode_value (ptr, &ptr);
- type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
-
- klass = mono_class_from_mono_type (type);
- mono_class_init (klass);
- g_print ("type in sig: %s\n", klass->name);*/
klass = mono_class_get_full (image, MONO_TOKEN_TYPE_SPEC | nindex, context);
//FIXME can't klass be null?
mono_class_init (klass);
if (retklass)
*retklass = klass;
field = mono_class_get_field_from_name (klass, fname);
+ if (field)
+ sig_field = mono_metadata_get_corresponding_field_from_generic_type_definition (field);
break;
}
default:
if (!field)
mono_loader_set_error_field_load (klass, fname);
+ else if (sig_field && !mono_metadata_type_equal_full (sig_type, sig_field->type, TRUE)) {
+ mono_loader_set_error_field_load (klass, fname);
+ return NULL;
+ }
return field;
}
if (table == MONO_TABLE_METHODSPEC) {
g_assert (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) &&
- !(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
mono_method_signature (method));
g_assert (method->is_inflated);
else
method = method_from_memberref (image, nindex, context, NULL);
+ if (!method)
+ return NULL;
+
klass = method->klass;
if (klass->generic_class) {
return mono_dllmap_lookup_list (global_dll_map, dll, func, rdll, rfunc);
}
+/*
+ * mono_dllmap_insert:
+ *
+ * LOCKING: Acquires the loader lock.
+ *
+ * NOTE: This can be called before the runtime is initialized, for example from
+ * mono_config_parse ().
+ */
void
-mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, const char *tdll, const char *tfunc) {
+mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, const char *tdll, const char *tfunc)
+{
MonoDllMap *entry;
+ mono_loader_init ();
+
mono_loader_lock ();
if (!assembly) {
entry->next = global_dll_map;
global_dll_map = entry;
} else {
- MonoMemPool *mpool = assembly->mempool;
- entry = mono_mempool_alloc0 (mpool, sizeof (MonoDllMap));
- entry->dll = dll? mono_mempool_strdup (mpool, dll): NULL;
- entry->target = tdll? mono_mempool_strdup (mpool, tdll): NULL;
- entry->func = func? mono_mempool_strdup (mpool, func): NULL;
- entry->target_func = tfunc? mono_mempool_strdup (mpool, tfunc): NULL;
+ entry = mono_image_alloc0 (assembly, sizeof (MonoDllMap));
+ entry->dll = dll? mono_image_strdup (assembly, dll): NULL;
+ entry->target = tdll? mono_image_strdup (assembly, tdll): NULL;
+ entry->func = func? mono_image_strdup (assembly, func): NULL;
+ entry->target_func = tfunc? mono_image_strdup (assembly, tfunc): NULL;
entry->next = assembly->dll_map;
assembly->dll_map = entry;
}
if ((cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
(cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL))
- result = (MonoMethod *)mono_mempool_alloc0 (image->mempool, sizeof (MonoMethodPInvoke));
+ result = (MonoMethod *)mono_image_alloc0 (image, sizeof (MonoMethodPInvoke));
else
- result = (MonoMethod *)mono_mempool_alloc0 (image->mempool, sizeof (MonoMethodNormal));
+ result = (MonoMethod *)mono_image_alloc0 (image, sizeof (MonoMethodNormal));
mono_stats.method_count ++;
{
MonoMethod *method, *result;
MonoClass *ic = NULL;
- MonoGenericContext *class_context = NULL, *method_context = NULL;
+ MonoGenericContext *method_context = NULL;
MonoMethodSignature *sig, *original_sig;
mono_loader_lock ();
if ((constrained_class != method->klass) && (method->klass->interface_id != 0))
ic = method->klass;
- if (constrained_class->generic_class)
- class_context = mono_class_get_context (constrained_class);
-
result = find_method (constrained_class, ic, method->name, sig, constrained_class);
if (sig != original_sig)
mono_metadata_free_inflated_signature (sig);
return NULL;
}
- if (class_context)
- result = mono_class_inflate_generic_method (result, class_context);
if (method_context)
result = mono_class_inflate_generic_method (result, method_context);
projects / mono.git / blobdiff