[runtime] Remove mono_loader_error_prepare_exception, nothing can produce loader...

diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h
index c3fb579e54a74a348030ba87b9629abcb4fe4c10..f2b03c7f5cb4ea5a5da5d63032a6d03741c9c98c 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -1234,9 +1234,6 @@ mono_loader_lock_if_inited (void);
 void
 mono_loader_unlock_if_inited (void);
 
-MonoException *
-mono_loader_error_prepare_exception (MonoLoaderError *error);
-
 MonoLoaderError *
 mono_loader_get_last_error (void);
 

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index fc0b545430282f1b1f367229d742cccd5c160468..b6dfce09f9e39ad98a279da4486c2cb0e398fb4b 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -10074,17 +10074,8 @@ mono_class_get_exception_for_failure (MonoClass *klass)
                return mono_exception_from_name_msg (mono_defaults.corlib, "System", "InvalidProgramException", "");
        }
        default: {
-               MonoLoaderError *error;
-               MonoException *ex;
-               
-               error = mono_loader_get_last_error ();
-               if (error != NULL){
-                       ex = mono_loader_error_prepare_exception (error);
-                       return ex;
-               }
-               
                /* TODO - handle other class related failures */
-               return NULL;
+               return mono_get_exception_execution_engine ("Unknown class failure");
        }
        }
 }

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 9e5304375ff2c14219c47cdbd9bad64280a503f2..25818615aa42d102b6d9ec0a85f5fca223d94435 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -3858,8 +3858,7 @@ loader_error:
        if (mono_class_has_failure (klass)) {
                *ex = mono_class_get_exception_for_failure (klass);
        } else {
-               *ex = mono_loader_error_prepare_exception (mono_loader_get_last_error ());
-               mono_loader_clear_error ();
+               *ex = mono_get_exception_execution_engine ("Unknown error");
        }
        return NULL;
 }
@@ -4508,20 +4507,9 @@ ves_icall_System_Reflection_Assembly_InternalGetType (MonoReflectionAssembly *as
                if (throwOnError)
                        e = mono_get_exception_type_load (name, NULL);
 
-               if (mono_loader_get_last_error () && mono_defaults.generic_ilist_class)
-                       e = mono_loader_error_prepare_exception (mono_loader_get_last_error ());
-
-               mono_loader_clear_error ();
-
                if (e != NULL)
                        mono_set_pending_exception (e);
                return NULL;
-       } else if (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 ();
        }
 
        if (type->type == MONO_TYPE_CLASS) {
@@ -7983,12 +7971,7 @@ custom_attrs_get_by_type (MonoObject *obj, MonoReflectionType *attr_type)
                return NULL;
        }
 
-       if (mono_loader_get_last_error ()) {
-               mono_set_pending_exception (mono_loader_error_prepare_exception (mono_loader_get_last_error ()));
-               return NULL;
-       } else {
-               return res;
-       }
+       return res;
 }
 
 ICALL_EXPORT MonoArray*

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index ddce819ed1266c119da31157a3af89b72bca69a7..48fef132d4de459a986386e03e677262d8516b43 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -176,93 +176,6 @@ mono_loader_clear_error (void)
        }
 }
 
-/**
- * mono_loader_error_prepare_exception:
- * @error: The MonoLoaderError to turn into an exception
- *
- * This turns a MonoLoaderError into an exception that can be thrown
- * and resets the Mono Loader Error state during this process.
- *
- */
-MonoException *
-mono_loader_error_prepare_exception (MonoLoaderError *error)
-{
-       MonoException *ex = NULL;
-
-       switch (error->exception_type) {
-       case MONO_EXCEPTION_TYPE_LOAD: {
-               char *cname = g_strdup (error->class_name);
-               char *aname = g_strdup (error->assembly_name);
-               MonoString *class_name;
-               
-               mono_loader_clear_error ();
-               
-               class_name = mono_string_new (mono_domain_get (), cname);
-
-               ex = mono_get_exception_type_load (class_name, aname);
-               g_free (cname);
-               g_free (aname);
-               break;
-        }
-       case MONO_EXCEPTION_MISSING_METHOD: {
-               char *cname = g_strdup (error->class_name);
-               char *aname = g_strdup (error->member_name);
-               
-               mono_loader_clear_error ();
-               ex = mono_get_exception_missing_method (cname, aname);
-               g_free (cname);
-               g_free (aname);
-               break;
-       }
-               
-       case MONO_EXCEPTION_MISSING_FIELD: {
-               char *class_name;
-               char *cmembername = g_strdup (error->member_name);
-               if (error->klass)
-                       class_name = mono_type_get_full_name (error->klass);
-               else
-                       class_name = g_strdup ("");
-
-               mono_loader_clear_error ();
-               
-               ex = mono_get_exception_missing_field (class_name, cmembername);
-               g_free (class_name);
-               g_free (cmembername);
-               break;
-        }
-       
-       case MONO_EXCEPTION_FILE_NOT_FOUND: {
-               char *msg;
-               char *filename;
-
-               if (error->ref_only)
-                       msg = g_strdup_printf ("Cannot resolve dependency to assembly '%s' because it has not been preloaded. When using the ReflectionOnly APIs, dependent assemblies must be pre-loaded or loaded on demand through the ReflectionOnlyAssemblyResolve event.", error->assembly_name);
-               else
-                       msg = g_strdup_printf ("Could not load file or assembly '%s' or one of its dependencies.", error->assembly_name);
-               filename = g_strdup (error->assembly_name);
-               /* Has to call this before calling anything which might call mono_class_init () */
-               mono_loader_clear_error ();
-               ex = mono_get_exception_file_not_found2 (msg, mono_string_new (mono_domain_get (), filename));
-               g_free (msg);
-               g_free (filename);
-               break;
-       }
-
-       case MONO_EXCEPTION_BAD_IMAGE: {
-               char *msg = g_strdup (error->msg);
-               mono_loader_clear_error ();
-               ex = mono_get_exception_bad_image_format (msg);
-               g_free (msg);
-               break;
-       }
-
-       default:
-               g_assert_not_reached ();
-       }
-
-       return ex;
-}
-
 /*
  * find_cached_memberref_sig:
  *