X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmetadata%2Fsre.c;h=eda0cf400756e1bbb0283f4df6d054865a4aa768;hb=792b5367cd3a6ffa1a192c4d2d7ace3509cbb646;hp=9e4f12c75f6ddb7c229d751b0fa4c1ac0c8b8fb7;hpb=ca2292b6c23608960c80af30e28d69d2e6ee9e0a;p=mono.git diff --git a/mono/metadata/sre.c b/mono/metadata/sre.c index 9e4f12c75f6..eda0cf40075 100644 --- a/mono/metadata/sre.c +++ b/mono/metadata/sre.c @@ -43,7 +43,6 @@ static GENERATE_GET_CLASS_WITH_CACHE (module_builder, "System.Reflection.Emit", static char* string_to_utf8_image_raw (MonoImage *image, MonoString *s, MonoError *error); #ifndef DISABLE_REFLECTION_EMIT -static guint32 mono_image_get_methodref_token (MonoDynamicImage *assembly, MonoMethod *method, gboolean create_typespec); static guint32 mono_image_get_sighelper_token (MonoDynamicImage *assembly, MonoReflectionSigHelperHandle helper, MonoError *error); static gboolean ensure_runtime_vtable (MonoClass *klass, MonoError *error); static void reflection_methodbuilder_from_dynamic_method (ReflectionMethodBuilder *rmb, MonoReflectionDynamicMethod *mb); @@ -520,7 +519,8 @@ mono_reflection_methodbuilder_from_ctor_builder (ReflectionMethodBuilder *rmb, M rmb->call_conv = mb->call_conv; rmb->code = NULL; rmb->type = mb->type; - rmb->name = mono_string_new (mono_domain_get (), name); + rmb->name = mono_string_new_checked (mono_domain_get (), name, error); + return_val_if_nok (error, FALSE); rmb->table_idx = &mb->table_idx; rmb->init_locals = mb->init_locals; rmb->skip_visibility = FALSE; @@ -641,7 +641,7 @@ mono_image_get_memberref_token (MonoDynamicImage *assembly, MonoType *type, cons } -static guint32 +guint32 mono_image_get_methodref_token (MonoDynamicImage *assembly, MonoMethod *method, gboolean create_typespec) { MONO_REQ_GC_NEUTRAL_MODE; @@ -722,6 +722,14 @@ mono_image_get_varargs_method_token (MonoDynamicImage *assembly, guint32 origina return token; } +#else /* DISABLE_REFLECTION_EMIT */ + +guint32 +mono_image_get_methodref_token (MonoDynamicImage *assembly, MonoMethod *method, gboolean create_typespec) +{ + g_assert_not_reached (); + return -1; +} #endif static gboolean @@ -1014,7 +1022,7 @@ mono_image_insert_string (MonoReflectionModuleBuilderHandle ref_module, MonoStri } token = MONO_TOKEN_STRING | idx; - mono_dynamic_image_register_token (assembly, token, MONO_HANDLE_CAST (MonoObject, str)); + mono_dynamic_image_register_token (assembly, token, MONO_HANDLE_CAST (MonoObject, str), MONO_DYN_IMAGE_TOK_NEW); leave: HANDLE_FUNCTION_RETURN_VAL (token); @@ -1084,7 +1092,7 @@ mono_image_create_method_token (MonoDynamicImage *assembly, MonoObjectHandle obj g_error ("requested method token for %s\n", klass->name); } - mono_dynamic_image_register_token (assembly, token, obj); + mono_dynamic_image_register_token (assembly, token, obj, MONO_DYN_IMAGE_TOK_NEW); return token; fail: g_assert (!mono_error_ok (error)); @@ -1120,12 +1128,18 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObjectHandle obj, return 0; } + /* This function is called from ModuleBuilder:getToken multiple times for the same objects */ + int how_collide = MONO_DYN_IMAGE_TOK_SAME_OK; + if (strcmp (klass->name, "RuntimeType") == 0) { MonoType *type = mono_reflection_type_handle_mono_type (MONO_HANDLE_CAST (MonoReflectionType, obj), error); return_val_if_nok (error, 0); MonoClass *mc = mono_class_from_mono_type (type); token = mono_metadata_token_from_dor ( mono_dynimage_encode_typedef_or_ref_full (assembly, type, !mono_class_is_gtd (mc) || create_open_instance)); + /* If it's a RuntimeType now, we could have registered a + * TypeBuilder for it before, so replacing is okay. */ + how_collide = MONO_DYN_IMAGE_TOK_REPLACE; } else if (strcmp (klass->name, "MonoCMethod") == 0 || strcmp (klass->name, "MonoMethod") == 0) { MonoReflectionMethodHandle m = MONO_HANDLE_CAST (MonoReflectionMethod, obj); @@ -1144,6 +1158,7 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObjectHandle obj, * FIXME: do the equivalent for Fields. */ token = method->token; + how_collide = MONO_DYN_IMAGE_TOK_REPLACE; } else { /* * Each token should have a unique index, but the indexes are @@ -1152,6 +1167,7 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObjectHandle obj, */ method_table_idx --; token = MONO_TOKEN_METHOD_DEF | method_table_idx; + how_collide = MONO_DYN_IMAGE_TOK_NEW; } } else { token = mono_image_get_methodref_token (assembly, method, create_open_instance); @@ -1164,6 +1180,7 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObjectHandle obj, static guint32 field_table_idx = 0xffffff; field_table_idx --; token = MONO_TOKEN_FIELD_DEF | field_table_idx; + how_collide = MONO_DYN_IMAGE_TOK_NEW; } else { token = mono_image_get_fieldref_token (assembly, obj, field); } @@ -1186,7 +1203,7 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObjectHandle obj, } if (register_token) - mono_dynamic_image_register_token (assembly, token, obj); + mono_dynamic_image_register_token (assembly, token, obj, how_collide); return token; } @@ -1196,6 +1213,25 @@ mono_image_create_token (MonoDynamicImage *assembly, MonoObjectHandle obj, #ifndef DISABLE_REFLECTION_EMIT +static gboolean +assemblybuilderaccess_can_refonlyload (guint32 access) +{ + return (access & 0x4) != 0; +} + +static gboolean +assemblybuilderaccess_can_run (guint32 access) +{ + return (access & MonoAssemblyBuilderAccess_Run) != 0; +} + +static gboolean +assemblybuilderaccess_can_save (guint32 access) +{ + return (access & MonoAssemblyBuilderAccess_Save) != 0; +} + + /* * mono_reflection_dynimage_basic_init: * @assembly: an assembly builder object @@ -1214,14 +1250,9 @@ mono_reflection_dynimage_basic_init (MonoReflectionAssemblyBuilder *assemblyb) if (assemblyb->dynamic_assembly) return; -#if HAVE_BOEHM_GC - /* assembly->assembly.image might be GC allocated */ - assembly = assemblyb->dynamic_assembly = (MonoDynamicAssembly *)GC_MALLOC (sizeof (MonoDynamicAssembly)); -#else assembly = assemblyb->dynamic_assembly = g_new0 (MonoDynamicAssembly, 1); -#endif - mono_profiler_assembly_event (&assembly->assembly, MONO_PROFILE_START_LOAD); + MONO_PROFILER_RAISE (assembly_loading, (&assembly->assembly)); assembly->assembly.ref_count = 1; assembly->assembly.dynamic = TRUE; @@ -1257,8 +1288,9 @@ mono_reflection_dynimage_basic_init (MonoReflectionAssemblyBuilder *assemblyb) assembly->assembly.aname.revision = 0; } - assembly->run = assemblyb->access != 2; - assembly->save = assemblyb->access != 1; + assembly->assembly.ref_only = assemblybuilderaccess_can_refonlyload (assemblyb->access); + assembly->run = assemblybuilderaccess_can_run (assemblyb->access); + assembly->save = assemblybuilderaccess_can_save (assemblyb->access); assembly->domain = domain; char *assembly_name = mono_string_to_utf8_checked (assemblyb->name, &error); @@ -1282,7 +1314,7 @@ mono_reflection_dynimage_basic_init (MonoReflectionAssemblyBuilder *assemblyb) register_assembly (mono_object_domain (assemblyb), &assemblyb->assembly, &assembly->assembly); - mono_profiler_assembly_loaded (&assembly->assembly, MONO_PROFILE_OK); + MONO_PROFILER_RAISE (assembly_loaded, (&assembly->assembly)); mono_assembly_invoke_load_hook ((MonoAssembly*)assembly); } @@ -1642,10 +1674,18 @@ mono_reflection_type_handle_mono_type (MonoReflectionTypeHandle ref, MonoError * goto leave; g_assert (base); gint32 rank = MONO_HANDLE_GETVAL (sre_array, rank); - if (rank == 0) //single dimentional array - result = &mono_array_class_get (mono_class_from_mono_type (base), 1)->byval_arg; - else - result = &mono_bounded_array_class_get (mono_class_from_mono_type (base), rank, TRUE)->byval_arg; + MonoClass *eclass = mono_class_from_mono_type (base); + result = mono_image_new0 (eclass->image, MonoType, 1); + if (rank == 0) { + result->type = MONO_TYPE_SZARRAY; + result->data.klass = eclass; + } else { + MonoArrayType *at = (MonoArrayType *)mono_image_alloc0 (eclass->image, sizeof (MonoArrayType)); + result->type = MONO_TYPE_ARRAY; + result->data.array = at; + at->eklass = eclass; + at->rank = rank; + } MONO_HANDLE_SETVAL (ref, type, MonoType*, result); } else if (is_sre_byref (klass)) { MonoReflectionDerivedTypeHandle sre_byref = MONO_HANDLE_CAST (MonoReflectionDerivedType, ref); @@ -2422,7 +2462,7 @@ reflection_setup_internal_class_internal (MonoReflectionTypeBuilderHandle ref_tb klass->type_token = MONO_TOKEN_TYPE_DEF | table_idx; mono_class_set_flags (klass, MONO_HANDLE_GETVAL (ref_tb, attrs)); - mono_profiler_class_event (klass, MONO_PROFILE_START_LOAD); + MONO_PROFILER_RAISE (class_loading, (klass)); klass->element_class = klass; @@ -2443,7 +2483,7 @@ reflection_setup_internal_class_internal (MonoReflectionTypeBuilderHandle ref_tb */ mono_image_append_class_to_reflection_info_set (klass); - mono_dynamic_image_register_token (dynamic_image, MONO_TOKEN_TYPE_DEF | table_idx, MONO_HANDLE_CAST (MonoObject, ref_tb)); + mono_dynamic_image_register_token (dynamic_image, MONO_TOKEN_TYPE_DEF | table_idx, MONO_HANDLE_CAST (MonoObject, ref_tb), MONO_DYN_IMAGE_TOK_NEW); if ((!strcmp (klass->name, "ValueType") && !strcmp (klass->name_space, "System")) || (!strcmp (klass->name, "Object") && !strcmp (klass->name_space, "System")) || @@ -2514,7 +2554,7 @@ reflection_setup_internal_class_internal (MonoReflectionTypeBuilderHandle ref_tb /*g_print ("setup %s as %s (%p)\n", klass->name, ((MonoObject*)tb)->vtable->klass->name, tb);*/ - mono_profiler_class_loaded (klass, MONO_PROFILE_OK); + MONO_PROFILER_RAISE (class_loaded, (klass)); leave: mono_loader_unlock (); @@ -2581,6 +2621,11 @@ reflection_init_generic_class (MonoReflectionTypeBuilderHandle ref_tb, MonoError } generic_container->context.class_inst = mono_get_shared_generic_inst (generic_container); + MonoGenericContext* context = &generic_container->context; + MonoType *canonical_inst = &((MonoClassGtd*)klass)->canonical_inst; + canonical_inst->type = MONO_TYPE_GENERICINST; + canonical_inst->data.generic_class = mono_metadata_lookup_generic_class (klass, context->class_inst, FALSE); + leave: HANDLE_FUNCTION_RETURN_VAL (is_ok (error)); } @@ -3404,6 +3449,11 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error) return_if_nok (error); } + if (!klass->enumtype && !mono_type_get_underlying_type (field->type)) { + mono_class_set_type_load_failure (klass, "Field '%s' is an enum type with a bad underlying type", field->name); + continue; + } + if ((fb->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA) && (rva_data = fb->rva_data)) { char *base = mono_array_addr (rva_data, char, 0); size_t size = mono_array_length (rva_data); @@ -3429,7 +3479,9 @@ typebuilder_setup_fields (MonoClass *klass, MonoError *error) } } - mono_class_layout_fields (klass, instance_size, packing_size, TRUE); + if (!mono_class_has_failure (klass)) { + mono_class_layout_fields (klass, instance_size, packing_size, TRUE); + } } static void @@ -4244,7 +4296,7 @@ mono_reflection_type_handle_mono_type (MonoReflectionTypeHandle ref, MonoError * void mono_sre_generic_param_table_entry_free (GenericParamTableEntry *entry) { - mono_gc_deregister_root ((char*) &entry->gparam); + MONO_GC_UNREGISTER_ROOT_IF_MOVING (entry->gparam); g_free (entry); } @@ -4294,19 +4346,17 @@ void ves_icall_ModuleBuilder_RegisterToken (MonoReflectionModuleBuilderHandle mb, MonoObjectHandle obj, guint32 token, MonoError *error) { error_init (error); - mono_dynamic_image_register_token (MONO_HANDLE_GETVAL (mb, dynamic_image), token, obj); + /* This function may be called by ModuleBuilder.FixupTokens to update + * an existing token, so replace is okay here. */ + mono_dynamic_image_register_token (MONO_HANDLE_GETVAL (mb, dynamic_image), token, obj, MONO_DYN_IMAGE_TOK_REPLACE); } -MonoObject* -ves_icall_ModuleBuilder_GetRegisteredToken (MonoReflectionModuleBuilder *mb, guint32 token) +MonoObjectHandle +ves_icall_ModuleBuilder_GetRegisteredToken (MonoReflectionModuleBuilderHandle mb, guint32 token, MonoError *error) { - MonoObject *obj; - - mono_loader_lock (); - obj = (MonoObject *)mono_g_hash_table_lookup (mb->dynamic_image->tokens, GUINT_TO_POINTER (token)); - mono_loader_unlock (); - - return obj; + error_init (error); + MonoDynamicImage *dynamic_image = MONO_HANDLE_GETVAL (mb, dynamic_image); + return mono_dynamic_image_get_registered_token (dynamic_image, token, error); } #ifndef DISABLE_REFLECTION_EMIT @@ -4327,10 +4377,12 @@ ves_icall_AssemblyBuilder_basic_init (MonoReflectionAssemblyBuilder *assemblyb) } void -ves_icall_EnumBuilder_setup_enum_type (MonoReflectionType *enumtype, - MonoReflectionType *t) +ves_icall_EnumBuilder_setup_enum_type (MonoReflectionTypeHandle enumtype, + MonoReflectionTypeHandle t, + MonoError *error) { - enumtype->type = t->type; + error_init (error); + MONO_HANDLE_SETVAL (enumtype, type, MonoType*, MONO_HANDLE_GETVAL (t, type)); } void @@ -4347,10 +4399,12 @@ ves_icall_ModuleBuilder_getUSIndex (MonoReflectionModuleBuilderHandle module, Mo } void -ves_icall_ModuleBuilder_set_wrappers_type (MonoReflectionModuleBuilder *moduleb, MonoReflectionType *type) +ves_icall_ModuleBuilder_set_wrappers_type (MonoReflectionModuleBuilderHandle moduleb, MonoReflectionTypeHandle ref_type, MonoError *error) { - MonoDynamicImage *image = moduleb->dynamic_image; + error_init (error); + MonoDynamicImage *image = MONO_HANDLE_GETVAL (moduleb, dynamic_image); + MonoType *type = MONO_HANDLE_GETVAL (ref_type, type); - g_assert (type->type); - image->wrappers_type = mono_class_from_mono_type (type->type); + g_assert (type); + image->wrappers_type = mono_class_from_mono_type (type); }