From 783593ac126093c82622c6d26d47e2ce3b2d25a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Fri, 26 Aug 2016 17:46:11 -0400 Subject: [PATCH] [runtime] ves_icall_AssemblyBuilder_InternalAddModule is dead code (#3461) There is no System.Refleciton.Emit.AssemblyBuilder::InternalAddModule method --- mono/metadata/icall-def.h | 3 +- mono/metadata/object-internals.h | 1 - mono/metadata/sre.c | 78 -------------------------------- 3 files changed, 1 insertion(+), 81 deletions(-) diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index 7993b244574..863af471cc5 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -530,8 +530,7 @@ ICALL(ASSEMN_2, "get_public_token", mono_digest_get_public_token) ICALL_TYPE(CATTR_DATA, "System.Reflection.CustomAttributeData", CATTR_DATA_1) ICALL(CATTR_DATA_1, "ResolveArgumentsInternal", ves_icall_System_Reflection_CustomAttributeData_ResolveArgumentsInternal) -ICALL_TYPE(ASSEMB, "System.Reflection.Emit.AssemblyBuilder", ASSEMB_1) -ICALL(ASSEMB_1, "InternalAddModule", ves_icall_AssemblyBuilder_InternalAddModule) +ICALL_TYPE(ASSEMB, "System.Reflection.Emit.AssemblyBuilder", ASSEMB_2) ICALL(ASSEMB_2, "basic_init", ves_icall_AssemblyBuilder_basic_init) #ifndef DISABLE_REFLECTION_EMIT diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h index 86ec983cfa5..1f114033b5f 100644 --- a/mono/metadata/object-internals.h +++ b/mono/metadata/object-internals.h @@ -1329,7 +1329,6 @@ typedef struct { } CattrNamedArg; gboolean mono_image_create_pefile (MonoReflectionModuleBuilder *module, HANDLE file, MonoError *error); -MonoReflectionModule * mono_image_load_module_dynamic (MonoReflectionAssemblyBuilder *assembly, MonoString *file_name, MonoError *error); guint32 mono_image_insert_string (MonoReflectionModuleBuilder *module, MonoString *str); guint32 mono_image_create_token (MonoDynamicImage *assembly, MonoObject *obj, gboolean create_methodspec, gboolean register_token, MonoError *error); guint32 mono_image_create_method_token (MonoDynamicImage *assembly, MonoObject *obj, MonoArray *opt_param_types, MonoError *error); diff --git a/mono/metadata/sre.c b/mono/metadata/sre.c index 6cfb5296a26..50ec350fe9c 100644 --- a/mono/metadata/sre.c +++ b/mono/metadata/sre.c @@ -1967,68 +1967,6 @@ mono_reflection_dynimage_basic_init (MonoReflectionAssemblyBuilder *assemblyb) #endif /* !DISABLE_REFLECTION_EMIT */ -#ifndef DISABLE_REFLECTION_EMIT - -MonoReflectionModule * -mono_image_load_module_dynamic (MonoReflectionAssemblyBuilder *ab, MonoString *fileName, MonoError *error) -{ - char *name; - MonoImage *image; - MonoImageOpenStatus status; - MonoDynamicAssembly *assembly; - guint32 module_count; - MonoImage **new_modules; - gboolean *new_modules_loaded; - - mono_error_init (error); - - name = mono_string_to_utf8_checked (fileName, error); - return_val_if_nok (error, NULL); - - image = mono_image_open (name, &status); - if (!image) { - if (status == MONO_IMAGE_ERROR_ERRNO) - mono_error_set_exception_instance (error, mono_get_exception_file_not_found (fileName)); - else - mono_error_set_bad_image_name (error, name, NULL); - g_free (name); - return NULL; - } - - g_free (name); - - assembly = ab->dynamic_assembly; - image->assembly = (MonoAssembly*)assembly; - - module_count = image->assembly->image->module_count; - new_modules = g_new0 (MonoImage *, module_count + 1); - new_modules_loaded = g_new0 (gboolean, module_count + 1); - - if (image->assembly->image->modules) - memcpy (new_modules, image->assembly->image->modules, module_count * sizeof (MonoImage *)); - if (image->assembly->image->modules_loaded) - memcpy (new_modules_loaded, image->assembly->image->modules_loaded, module_count * sizeof (gboolean)); - new_modules [module_count] = image; - new_modules_loaded [module_count] = TRUE; - mono_image_addref (image); - - g_free (image->assembly->image->modules); - image->assembly->image->modules = new_modules; - image->assembly->image->modules_loaded = new_modules_loaded; - image->assembly->image->module_count ++; - - mono_assembly_load_references (image, &status); - if (status) { - mono_image_close (image); - mono_error_set_exception_instance (error, mono_get_exception_file_not_found (fileName)); - return NULL; - } - - return mono_module_get_object_checked (mono_domain_get (), image, error); -} - -#endif /* DISABLE_REFLECTION_EMIT */ - #ifndef DISABLE_REFLECTION_EMIT static gpointer register_assembly (MonoDomain *domain, MonoReflectionAssembly *res, MonoAssembly *assembly) @@ -5365,13 +5303,6 @@ mono_image_module_basic_init (MonoReflectionModuleBuilder *moduleb) g_assert_not_reached (); } -MonoReflectionModule * -mono_image_load_module_dynamic (MonoReflectionAssemblyBuilder *ab, MonoString *fileName, MonoError *error) -{ - g_assert_not_reached (); - return NULL; -} - guint32 mono_image_insert_string (MonoReflectionModuleBuilder *module, MonoString *str) { @@ -5525,15 +5456,6 @@ ves_icall_ModuleBuilder_GetRegisteredToken (MonoReflectionModuleBuilder *mb, gui return obj; } -MonoReflectionModule* -ves_icall_AssemblyBuilder_InternalAddModule (MonoReflectionAssemblyBuilder *ab, MonoString *fileName) -{ - MonoError error; - MonoReflectionModule *result = mono_image_load_module_dynamic (ab, fileName, &error); - mono_error_set_pending_exception (&error); - return result; -} - /** * ves_icall_TypeBuilder_create_generic_class: * @tb: a TypeBuilder object -- 2.25.1