[runtime] Replace mono_class_from_name with mono_class_load_from_name for explicit...

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 8be159eae8bea2b8fa8ad85d020c778a781d1dfe..7bc9ab9c88163dee7e74afa2a3a0fa54b8a4f3a1 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -259,11 +259,11 @@ mono_runtime_init_checked (MonoDomain *domain, MonoThreadStartCB start_cb, MonoT
 
        mono_thread_init (start_cb, attach_cb);
 
-       klass = mono_class_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
+       klass = mono_class_load_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
        setup = (MonoAppDomainSetup *) mono_object_new_pinned (domain, klass, error);
        return_if_nok (error);
 
-       klass = mono_class_from_name (mono_defaults.corlib, "System", "AppDomain");
+       klass = mono_class_load_from_name (mono_defaults.corlib, "System", "AppDomain");
 
        ad = (MonoAppDomain *) mono_object_new_pinned (domain, klass, error);
        return_if_nok (error);
@@ -309,7 +309,7 @@ mono_get_corlib_version (void)
        MonoClassField *field;
        MonoObject *value;
 
-       klass = mono_class_from_name (mono_defaults.corlib, "System", "Environment");
+       klass = mono_class_load_from_name (mono_defaults.corlib, "System", "Environment");
        mono_class_init (klass);
        field = mono_class_get_field_from_name (klass, "mono_corlib_version");
        if (!field)
@@ -360,8 +360,7 @@ mono_context_init_checked (MonoDomain *domain, MonoError *error)
 
        mono_error_init (error);
 
-       klass = mono_class_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Contexts", "Context");
-
+       klass = mono_class_load_from_name (mono_defaults.corlib, "System.Runtime.Remoting.Contexts", "Context");
        context = (MonoAppContext *) mono_object_new_pinned (domain, klass, error);
        return_if_nok (error);
 
@@ -430,7 +429,7 @@ mono_domain_create_appdomain (char *friendly_name, char *configuration_file)
        MonoAppDomainSetup *setup;
        MonoClass *klass;
 
-       klass = mono_class_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
+       klass = mono_class_load_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
        setup = (MonoAppDomainSetup *) mono_object_new_checked (mono_domain_get (), klass, &error);
        mono_error_raise_exception (&error); /* FIXME don't raise here */
        setup->configuration_file = configuration_file != NULL ? mono_string_new (mono_domain_get (), configuration_file) : NULL;
@@ -470,7 +469,7 @@ copy_app_domain_setup (MonoDomain *domain, MonoAppDomainSetup *setup, MonoError
        mono_error_init (error);
 
        caller_domain = mono_domain_get ();
-       ads_class = mono_class_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
+       ads_class = mono_class_load_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
 
        copy = (MonoAppDomainSetup*)mono_object_new_checked (domain, ads_class, error);
        return_val_if_nok (error, NULL);
@@ -513,7 +512,7 @@ mono_domain_create_appdomain_internal (char *friendly_name, MonoAppDomainSetup *
 
        mono_error_init (error);
 
-       adclass = mono_class_from_name (mono_defaults.corlib, "System", "AppDomain");
+       adclass = mono_class_load_from_name (mono_defaults.corlib, "System", "AppDomain");
 
        /* FIXME: pin all those objects */
        data = mono_domain_create();

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index ff15ea34898efefd5b208202902af6b90c6ad71b..75e4451c4111d2c8b9a9e29bccabe3fe53235f64 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -3102,15 +3102,15 @@ get_implicit_generic_array_interfaces (MonoClass *klass, int *num, int *is_enume
        all_interfaces = eclass->rank && eclass->element_class->rank? FALSE: TRUE;
 
        if (!generic_icollection_class) {
-               generic_icollection_class = mono_class_from_name (mono_defaults.corlib,
+               generic_icollection_class = mono_class_load_from_name (mono_defaults.corlib,
                        "System.Collections.Generic", "ICollection`1");
-               generic_ienumerable_class = mono_class_from_name (mono_defaults.corlib,
+               generic_ienumerable_class = mono_class_load_from_name (mono_defaults.corlib,
                        "System.Collections.Generic", "IEnumerable`1");
-               generic_ienumerator_class = mono_class_from_name (mono_defaults.corlib,
+               generic_ienumerator_class = mono_class_load_from_name (mono_defaults.corlib,
                        "System.Collections.Generic", "IEnumerator`1");
-               generic_ireadonlylist_class = mono_class_from_name (mono_defaults.corlib,
+               generic_ireadonlylist_class = mono_class_load_from_name (mono_defaults.corlib,
                        "System.Collections.Generic", "IReadOnlyList`1");
-               generic_ireadonlycollection_class = mono_class_from_name (mono_defaults.corlib,
+               generic_ireadonlycollection_class = mono_class_load_from_name (mono_defaults.corlib,
                        "System.Collections.Generic", "IReadOnlyCollection`1");
        }
 
@@ -6217,7 +6217,7 @@ make_generic_param_class (MonoGenericParam *param, MonoGenericParamInfo *pinfo)
                CHECKED_METADATA_WRITE_PTR ( klass->parent , pinfo->constraints [0] );
                pos++;
        } else if (pinfo && pinfo->flags & GENERIC_PARAMETER_ATTRIBUTE_VALUE_TYPE_CONSTRAINT) {
-               CHECKED_METADATA_WRITE_PTR ( klass->parent , mono_class_from_name (mono_defaults.corlib, "System", "ValueType") );
+               CHECKED_METADATA_WRITE_PTR ( klass->parent , mono_class_load_from_name (mono_defaults.corlib, "System", "ValueType") );
        } else {
                CHECKED_METADATA_WRITE_PTR ( klass->parent , mono_defaults.object_class );
        }
@@ -6743,7 +6743,7 @@ mono_bounded_array_class_get (MonoClass *eclass, guint32 rank, gboolean bounded)
 
        /* for the building corlib use System.Array from it */
        if (image->assembly && assembly_is_dynamic (image->assembly) && image->assembly_name && strcmp (image->assembly_name, "mscorlib") == 0) {
-               parent = mono_class_from_name (image, "System", "Array");
+               parent = mono_class_load_from_name (image, "System", "Array");
                corlib_type = TRUE;
        } else {
                parent = mono_defaults.array_class;

diff --git a/mono/metadata/cominterop.c b/mono/metadata/cominterop.c
index 9824f1b1bc09d5dc8ea3872e3dfb165dc40d5d20..8d3f714f7a9cbc059fa975c1afa241416f7a7e28 100644 (file)
--- a/mono/metadata/cominterop.c
+++ b/mono/metadata/cominterop.c
@@ -181,7 +181,7 @@ mono_class_try_get_com_object_class (void)
        static gboolean inited;
        MonoClass *klass;
        if (!inited) {
-               klass = mono_class_from_name (mono_defaults.corlib, "System", "__ComObject");
+               klass = mono_class_load_from_name (mono_defaults.corlib, "System", "__ComObject");
                mono_memory_barrier ();
                tmp_class = klass;
                mono_memory_barrier ();
@@ -1910,7 +1910,7 @@ cominterop_get_ccw (MonoObject* object, MonoClass* itf)
        if (cinfo) {
                static MonoClass* coclass_attribute = NULL;
                if (!coclass_attribute)
-                       coclass_attribute = mono_class_from_name (mono_defaults.corlib, "System.Runtime.InteropServices", "CoClassAttribute");
+                       coclass_attribute = mono_class_load_from_name (mono_defaults.corlib, "System.Runtime.InteropServices", "CoClassAttribute");
                if (mono_custom_attrs_has_attr (cinfo, coclass_attribute)) {
                        g_assert(itf->interface_count && itf->interfaces[0]);
                        itf = itf->interfaces[0];
@@ -2454,7 +2454,7 @@ cominterop_ccw_get_ids_of_names (MonoCCWInterface* ccwe, gpointer riid,
 
        /* Handle DispIdAttribute */
        if (!ComDispIdAttribute)
-               ComDispIdAttribute = mono_class_from_name (mono_defaults.corlib, "System.Runtime.InteropServices", "DispIdAttribute");
+               ComDispIdAttribute = mono_class_load_from_name (mono_defaults.corlib, "System.Runtime.InteropServices", "DispIdAttribute");
 
        g_assert (object);
        klass = mono_object_class (object);

diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index d97fa4286551920079e68e6d23b76d84a352ec3f..51ae17877d475404cb152e0e4a3444063791204b 100644 (file)
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -583,8 +583,7 @@ mono_get_exception_type_initialization (const gchar *type_name, MonoException *i
        MonoMethod *method;
        gpointer iter;
 
-       klass = mono_class_from_name (mono_get_corlib (), "System", "TypeInitializationException");
-       g_assert (klass);
+       klass = mono_class_load_from_name (mono_get_corlib (), "System", "TypeInitializationException");
 
        mono_class_init (klass);
 
@@ -759,8 +758,8 @@ mono_get_exception_reflection_type_load (MonoArray *types, MonoArray *exceptions
        MonoMethod *method;
        gpointer iter;
 
-       klass = mono_class_from_name (mono_get_corlib (), "System.Reflection", "ReflectionTypeLoadException");
-       g_assert (klass);
+       klass = mono_class_load_from_name (mono_get_corlib (), "System.Reflection", "ReflectionTypeLoadException");
+
        mono_class_init (klass);
 
        /* Find the Type[], Exception[] ctor */
@@ -798,8 +797,7 @@ mono_get_exception_runtime_wrapped (MonoObject *wrapped_exception)
        MonoDomain *domain = mono_domain_get ();
        gpointer params [16];
 
-       klass = mono_class_from_name (mono_get_corlib (), "System.Runtime.CompilerServices", "RuntimeWrappedException");
-       g_assert (klass);
+       klass = mono_class_load_from_name (mono_get_corlib (), "System.Runtime.CompilerServices", "RuntimeWrappedException");
 
        o = mono_object_new_checked (domain, klass, &error);
        g_assert (o != NULL && mono_error_ok (&error)); /* FIXME don't swallow the error */

diff --git a/mono/metadata/mono-mlist.c b/mono/metadata/mono-mlist.c
index d82ca0c831f7a167d88d04d5ecd71990f1b1699f..7e90b652dd5901714b31f60bfb95725fd85a8404 100644 (file)
--- a/mono/metadata/mono-mlist.c
+++ b/mono/metadata/mono-mlist.c
@@ -41,7 +41,7 @@ mono_mlist_alloc (MonoObject *data)
        MonoError error;
        MonoMList* res;
        if (!monolist_item_vtable) {
-               MonoClass *klass = mono_class_from_name (mono_defaults.corlib, "System", "MonoListItem");
+               MonoClass *klass = mono_class_load_from_name (mono_defaults.corlib, "System", "MonoListItem");
                monolist_item_vtable = mono_class_vtable (mono_get_root_domain (), klass);
                g_assert (monolist_item_vtable);
        }

diff --git a/mono/metadata/mono-security.c b/mono/metadata/mono-security.c
index 03cc519767a4172a258d86d922e7235213f2b17f..a27f82ecd292958c66ca56293c08d9b82009aadf 100644 (file)
--- a/mono/metadata/mono-security.c
+++ b/mono/metadata/mono-security.c
@@ -956,7 +956,7 @@ void invoke_protected_memory_method (MonoArray *data, MonoObject *scope, gboolea
                }
        }
 
-       klass = mono_class_from_name (system_security_assembly,
+       klass = mono_class_load_from_name (system_security_assembly,
                                                                  "System.Security.Cryptography", "ProtectedMemory");
        method = mono_class_get_method_from_name (klass, encrypt ? "Protect" : "Unprotect", 2);
        params [0] = data;

diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c
index 8f86228dce17bece01892b1e24934f67aa7af264..e070fed4ad436d1530110f0d72f23740bf334ab9 100644 (file)
--- a/mono/metadata/sgen-mono.c
+++ b/mono/metadata/sgen-mono.c
@@ -1198,14 +1198,12 @@ create_allocator (int atype, gboolean slowpath)
                /* catch */
                clause->flags = MONO_EXCEPTION_CLAUSE_NONE;
                clause->try_len = mono_mb_get_pos (mb) - clause->try_offset;
-               clause->data.catch_class = mono_class_from_name (mono_defaults.corlib,
+               clause->data.catch_class = mono_class_load_from_name (mono_defaults.corlib,
                                "System", "OverflowException");
-               g_assert (clause->data.catch_class);
                clause->handler_offset = mono_mb_get_label (mb);
 
-               oom_exc_class = mono_class_from_name (mono_defaults.corlib,
+               oom_exc_class = mono_class_load_from_name (mono_defaults.corlib,
                                "System", "OutOfMemoryException");
-               g_assert (oom_exc_class);
                ctor = mono_class_get_method_from_name (oom_exc_class, ".ctor", 0);
                g_assert (ctor);
 

diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index 7ddf9d3e4686faa5023da5d0e7bdd947e45d8180..333c41975004a9cfb5be337a2302263215d3562e 100644 (file)
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -602,8 +602,7 @@ get_family_hint (void)
                socket_assembly = get_socket_assembly ();
                g_assert (socket_assembly);
 
-               socket_class = mono_class_from_name (socket_assembly, "System.Net.Sockets", "Socket");
-               g_assert (socket_class);
+               socket_class = mono_class_load_from_name (socket_assembly, "System.Net.Sockets", "Socket");
 
                ipv4_field = mono_class_get_field_from_name (socket_class, "ipv4_supported");
                g_assert (ipv4_field);
@@ -832,8 +831,7 @@ create_object_from_sockaddr(struct sockaddr *saddr, int sa_size, gint32 *error)
 
        /* Build a System.Net.SocketAddress object instance */
        if (!domain->sockaddr_class) {
-               domain->sockaddr_class=mono_class_from_name (get_socket_assembly (), "System.Net", "SocketAddress");
-               g_assert (domain->sockaddr_class);
+               domain->sockaddr_class = mono_class_load_from_name (get_socket_assembly (), "System.Net", "SocketAddress");
        }
        sockaddr_obj=mono_object_new_checked(domain, domain->sockaddr_class, &merror);
        mono_error_raise_exception (&merror); /* FIXME don't raise here */
@@ -1978,7 +1976,7 @@ ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal (SOCKET sock, g
        switch(name) {
        case SocketOptionName_Linger:
                /* build a System.Net.Sockets.LingerOption */
-               obj_class=mono_class_from_name(get_socket_assembly (),
+               obj_class = mono_class_load_from_name (get_socket_assembly (),
                                               "System.Net.Sockets",
                                               "LingerOption");
                obj=mono_object_new_checked(domain, obj_class, &merror);
@@ -2027,7 +2025,7 @@ ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal (SOCKET sock, g
                        }
                }
                
-               obj_class = mono_class_from_name(mono_posix_image,
+               obj_class = mono_class_load_from_name (mono_posix_image,
                                                 "Mono.Posix",
                                                 "PeerCredData");
                obj = mono_object_new_checked(domain, obj_class, &merror);

diff --git a/mono/metadata/threadpool-ms.c b/mono/metadata/threadpool-ms.c
index 82f9d75c83a871ba74c9c6f9a599f890e8a4590e..ba70e75ca01dec739b87af6e05b40fa883083ccf 100644 (file)
--- a/mono/metadata/threadpool-ms.c
+++ b/mono/metadata/threadpool-ms.c
@@ -357,8 +357,7 @@ mono_threadpool_ms_enqueue_work_item (MonoDomain *domain, MonoObject *work_item)
        g_assert (work_item);
 
        if (!threadpool_class)
-               threadpool_class = mono_class_from_name (mono_defaults.corlib, "System.Threading", "ThreadPool");
-       g_assert (threadpool_class);
+               threadpool_class = mono_class_load_from_name (mono_defaults.corlib, "System.Threading", "ThreadPool");
 
        if (!unsafe_queue_custom_work_item_method)
                unsafe_queue_custom_work_item_method = mono_class_get_method_from_name (threadpool_class, "UnsafeQueueCustomWorkItem", 2);
@@ -1326,8 +1325,7 @@ mono_threadpool_ms_begin_invoke (MonoDomain *domain, MonoObject *target, MonoMet
        MonoObject *state = NULL;
 
        if (!async_call_klass)
-               async_call_klass = mono_class_from_name (mono_defaults.corlib, "System", "MonoAsyncCall");
-       g_assert (async_call_klass);
+               async_call_klass = mono_class_load_from_name (mono_defaults.corlib, "System", "MonoAsyncCall");
 
        mono_lazy_initialize (&status, initialize);
 

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index eb295fc30dd796ab4f8a9856349d54cce78f182a..80aec7e21638e72eb5847612a3834da02c68d9ee 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -3609,7 +3609,7 @@ add_wrappers (MonoAotCompile *acfg)
                /* Assembly runtime-invoke (string, bool) [DoAssemblyResolve] */
                csig = mono_metadata_signature_alloc (mono_defaults.corlib, 2);
                csig->hasthis = 1;
-               csig->ret = &(mono_class_from_name (
+               csig->ret = &(mono_class_load_from_name (
                                                                                        mono_defaults.corlib, "System.Reflection", "Assembly"))->byval_arg;
                csig->params [0] = &mono_defaults.string_class->byval_arg;
                csig->params [1] = &mono_defaults.boolean_class->byval_arg;
@@ -4279,14 +4279,13 @@ add_generic_class_with_depth (MonoAotCompile *acfg, MonoClass *klass, int depth,
 
                memset (&ctx, 0, sizeof (ctx));
 
-               icomparable = mono_class_from_name (mono_defaults.corlib, "System", "IComparable`1");
-               g_assert (icomparable);
+               icomparable = mono_class_load_from_name (mono_defaults.corlib, "System", "IComparable`1");
+
                args [0] = &tclass->byval_arg;
                ctx.class_inst = mono_metadata_get_generic_inst (1, args);
 
                if (mono_class_is_assignable_from (mono_class_inflate_generic_class (icomparable, &ctx), tclass)) {
-                       gcomparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "GenericComparer`1");
-                       g_assert (gcomparer);
+                       gcomparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "GenericComparer`1");
                        add_generic_class (acfg, mono_class_inflate_generic_class (gcomparer, &ctx), FALSE, "Comparer<T>");
                }
        }
@@ -4300,14 +4299,13 @@ add_generic_class_with_depth (MonoAotCompile *acfg, MonoClass *klass, int depth,
 
                memset (&ctx, 0, sizeof (ctx));
 
-               iface = mono_class_from_name (mono_defaults.corlib, "System", "IEquatable`1");
+               iface = mono_class_load_from_name (mono_defaults.corlib, "System", "IEquatable`1");
                g_assert (iface);
                args [0] = &tclass->byval_arg;
                ctx.class_inst = mono_metadata_get_generic_inst (1, args);
 
                if (mono_class_is_assignable_from (mono_class_inflate_generic_class (iface, &ctx), tclass)) {
-                       gcomparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "GenericEqualityComparer`1");
-                       g_assert (gcomparer);
+                       gcomparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "GenericEqualityComparer`1");
                        add_generic_class (acfg, mono_class_inflate_generic_class (gcomparer, &ctx), FALSE, "EqualityComparer<T>");
                }
        }
@@ -4324,8 +4322,7 @@ add_generic_class_with_depth (MonoAotCompile *acfg, MonoClass *klass, int depth,
                        args [0] = &tclass->byval_arg;
                        ctx.class_inst = mono_metadata_get_generic_inst (1, args);
 
-                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "EnumEqualityComparer`1");
-                       g_assert (enum_comparer);
+                       enum_comparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "EnumEqualityComparer`1");
                        add_generic_class (acfg, mono_class_inflate_generic_class (enum_comparer, &ctx), FALSE, "EqualityComparer<T>");
                }
        }
@@ -4342,8 +4339,7 @@ add_generic_class_with_depth (MonoAotCompile *acfg, MonoClass *klass, int depth,
                        args [0] = &tclass->byval_arg;
                        ctx.class_inst = mono_metadata_get_generic_inst (1, args);
 
-                       comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "ObjectComparer`1");
-                       g_assert (comparer);
+                       comparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "ObjectComparer`1");
                        add_generic_class (acfg, mono_class_inflate_generic_class (comparer, &ctx), FALSE, "Comparer<T>");
                }
        }
@@ -4579,24 +4575,20 @@ add_generic_instances (MonoAotCompile *acfg)
                        insts [ninsts ++] = &mono_defaults.uint32_class->byval_arg;
                        insts [ninsts ++] = &mono_defaults.uint16_class->byval_arg;
                        insts [ninsts ++] = &mono_defaults.byte_class->byval_arg;
-                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "EnumEqualityComparer`1");
-                       g_assert (enum_comparer);
+                       enum_comparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "EnumEqualityComparer`1");
                        add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
 
                        ninsts = 0;
                        insts [ninsts ++] = &mono_defaults.int16_class->byval_arg;
-                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "ShortEnumEqualityComparer`1");
-                       g_assert (enum_comparer);
+                       enum_comparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "ShortEnumEqualityComparer`1");
                        add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
 
                        ninsts = 0;
                        insts [ninsts ++] = &mono_defaults.sbyte_class->byval_arg;
-                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "SByteEnumEqualityComparer`1");
-                       g_assert (enum_comparer);
+                       enum_comparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "SByteEnumEqualityComparer`1");
                        add_instances_of (acfg, enum_comparer, insts, ninsts, FALSE);
 
-                       enum_comparer = mono_class_from_name (mono_defaults.corlib, "System.Collections.Generic", "LongEnumEqualityComparer`1");
-                       g_assert (enum_comparer);
+                       enum_comparer = mono_class_load_from_name (mono_defaults.corlib, "System.Collections.Generic", "LongEnumEqualityComparer`1");
                        ninsts = 0;
                        insts [ninsts ++] = &mono_defaults.int64_class->byval_arg;
                        insts [ninsts ++] = &mono_defaults.uint64_class->byval_arg;
@@ -4642,7 +4634,7 @@ add_generic_instances (MonoAotCompile *acfg)
                        MonoGenericContext ctx;
                        MonoType *args [16];
                        MonoMethod *m;
-                       MonoClass *interlocked_klass = mono_class_from_name (mono_defaults.corlib, "System.Threading", "Interlocked");
+                       MonoClass *interlocked_klass = mono_class_load_from_name (mono_defaults.corlib, "System.Threading", "Interlocked");
                        gpointer iter = NULL;
 
                        while ((m = mono_class_get_methods (interlocked_klass, &iter))) {
@@ -5383,9 +5375,8 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
                MonoClass *ex_class;
 
                ex_class =
-                       mono_class_from_name (mono_defaults.exception_class->image,
+                       mono_class_load_from_name (mono_defaults.exception_class->image,
                                                                  "System", (const char *)patch_info->data.target);
-               g_assert (ex_class);
                encode_klass_ref (acfg, ex_class, p, &p);
                break;
        }

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index f3de9130ce6e416d0c66b7f22604b3513c789f46..88acd40395bb82e7bacc2003731e47c11674766a 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -3328,18 +3328,14 @@ init_jit_info_dbg_attrs (MonoJitInfo *ji)
        if (ji->dbg_attrs_inited)
                return;
 
-       if (!hidden_klass) {
-               hidden_klass = mono_class_from_name (mono_defaults.corlib, "System.Diagnostics", "DebuggerHiddenAttribute");
-               g_assert (hidden_klass);
-       }
-       if (!step_through_klass) {
-               step_through_klass = mono_class_from_name (mono_defaults.corlib, "System.Diagnostics", "DebuggerStepThroughAttribute");
-               g_assert (step_through_klass);
-       }
-       if (!non_user_klass) {
-               non_user_klass = mono_class_from_name (mono_defaults.corlib, "System.Diagnostics", "DebuggerNonUserCodeAttribute");
-               g_assert (non_user_klass);
-       }
+       if (!hidden_klass)
+               hidden_klass = mono_class_load_from_name (mono_defaults.corlib, "System.Diagnostics", "DebuggerHiddenAttribute");
+
+       if (!step_through_klass)
+               step_through_klass = mono_class_load_from_name (mono_defaults.corlib, "System.Diagnostics", "DebuggerStepThroughAttribute");
+
+       if (!non_user_klass)
+               non_user_klass = mono_class_load_from_name (mono_defaults.corlib, "System.Diagnostics", "DebuggerNonUserCodeAttribute");
 
        ainfo = mono_custom_attrs_from_method (jinfo_get_method (ji));
        if (ainfo) {
@@ -6957,7 +6953,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                wait_for_suspend ();
 
 #ifdef TRY_MANAGED_SYSTEM_ENVIRONMENT_EXIT
-               env_class = mono_class_from_name (mono_defaults.corlib, "System", "Environment");
+               env_class = mono_class_try_load_from_name (mono_defaults.corlib, "System", "Environment");
                if (env_class)
                        exit_method = mono_class_get_method_from_name (env_class, "Exit", 1);
 #endif

diff --git a/mono/profiler/mono-profiler-iomap.c b/mono/profiler/mono-profiler-iomap.c
index 0dff9e980880e9e276e33182ceb53ea43ff693e4..7030a4b3e5fa4149528fda724c8c49e8fd51a321 100644 (file)
--- a/mono/profiler/mono-profiler-iomap.c
+++ b/mono/profiler/mono-profiler-iomap.c
@@ -195,7 +195,7 @@ static inline void print_report (const gchar *format, ...)
        vfprintf (stdout, format, ap);
        fprintf (stdout, "\n");
        va_end (ap);
-       klass = mono_class_from_name (mono_get_corlib (), "System", "Environment");
+       klass = mono_class_load_from_name (mono_get_corlib (), "System", "Environment");
        mono_class_init (klass);
        prop = mono_class_get_property_from_name (klass, "StackTrace");
        str = (MonoString*)mono_property_get_value (prop, NULL, NULL, NULL);