[runtime][jit] Replace usage of mono_class_from_name with mono_class_load_from_name...

diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index 51ae17877d475404cb152e0e4a3444063791204b..a66c9d723d15c63aa04c2d9d27ffafe3659c34b9 100644 (file)
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -64,7 +64,7 @@ mono_exception_from_name_domain (MonoDomain *domain, MonoImage *image,
        MonoObject *o;
        MonoDomain *caller_domain = mono_domain_get ();
 
-       klass = mono_class_from_name (image, name_space, name);
+       klass = mono_class_load_from_name (image, name_space, name);
 
        o = mono_object_new_checked (domain, klass, &error);
        g_assert (o != NULL && mono_error_ok (&error)); /* FIXME don't swallow the error */
@@ -168,7 +168,7 @@ MonoException *
 mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
                                      const char *name, MonoString *a1, MonoString *a2)
 {
-       MonoClass *klass = mono_class_from_name (image, name_space, name);
+       MonoClass *klass = mono_class_load_from_name (image, name_space, name);
 
        return create_exception_two_strings (klass, a1, a2);
 }

diff --git a/mono/metadata/method-builder.c b/mono/metadata/method-builder.c
index 23f8d5990952d0a176d19cbb1e26e1a0f305114a..5bbedbbb816a1f6c83c10568412c9ecbadaca2ad 100644 (file)
--- a/mono/metadata/method-builder.c
+++ b/mono/metadata/method-builder.c
@@ -550,7 +550,7 @@ mono_mb_emit_exception_full (MonoMethodBuilder *mb, const char *exc_nspace, cons
 {
        MonoMethod *ctor = NULL;
 
-       MonoClass *mme = mono_class_from_name (mono_defaults.corlib, exc_nspace, exc_name);
+       MonoClass *mme = mono_class_load_from_name (mono_defaults.corlib, exc_nspace, exc_name);
        mono_class_init (mme);
        ctor = mono_class_get_method_from_name (mme, ".ctor", 0);
        g_assert (ctor);

diff --git a/mono/mini/branch-opts.c b/mono/mini/branch-opts.c
index aeb11a0ff0e7ab327bac24441a82e0854a51cec2..1a4ea53fe1f9ecfa48455f4961f6e1c8f1283639 100644 (file)
--- a/mono/mini/branch-opts.c
+++ b/mono/mini/branch-opts.c
@@ -44,7 +44,7 @@ mono_branch_optimize_exception_target (MonoCompile *cfg, MonoBasicBlock *bb, con
        if (bb->region == -1 || !MONO_BBLOCK_IS_IN_REGION (bb, MONO_REGION_TRY))
                return NULL;
 
-       exclass = mono_class_from_name (mono_get_corlib (), "System", exname);
+       exclass = mono_class_load_from_name (mono_get_corlib (), "System", exname);
        /* search for the handler */
        for (i = 0; i < header->num_clauses; ++i) {
                clause = &header->clauses [i];

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 66d6d5c648156269d88893732fb302ae66f9fe5e..56ca3d7aaebb01544516a507fbd924b81e5444d6 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -7597,8 +7597,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 
                        amd64_patch (patch_info->ip.i + cfg->native_code, code);
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, "System", patch_info->data.name);
-                       g_assert (exc_class);
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", patch_info->data.name);
                        throw_ip = patch_info->ip.i;
 
                        //x86_breakpoint (code);

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index b1ddb65fc8fc0fb228950edd88a1a38e40505fbc..c9b74ee958f6e8caf0bdee4b6a4b80931b5aa05e 100644 (file)
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -6802,8 +6802,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
                        }
                        arm_patch (ip, code);
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, "System", patch_info->data.name);
-                       g_assert (exc_class);
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", patch_info->data.name);
 
                        ARM_MOV_REG_REG (code, ARMREG_R1, ARMREG_LR);
 #ifdef USE_JUMP_TABLES

diff --git a/mono/mini/mini-ia64.c b/mono/mini/mini-ia64.c
index 54222c26698975ce20e00aed2ec952697d36454a..aee49d44b2125b324b9770b24fa29c9ba2fe96f9 100644 (file)
--- a/mono/mini/mini-ia64.c
+++ b/mono/mini/mini-ia64.c
@@ -4188,8 +4188,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
                        guint8* buf;
                        guint64 exc_token_index;
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, "System", patch_info->data.name);
-                       g_assert (exc_class);
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", patch_info->data.name);
                        exc_token_index = mono_metadata_token_index (exc_class->type_token);
                        throw_ip = cfg->native_code + patch_info->ip.i;
 

diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c
index e42dd08f1fd40073da73946d6157725e5b464558..c41e2f280f9a9a14fe1b58fa51c9290534e7a965 100644 (file)
--- a/mono/mini/mini-llvm.c
+++ b/mono/mini/mini-llvm.c
@@ -2057,8 +2057,7 @@ emit_cond_system_exception (EmitContext *ctx, MonoBasicBlock *bb, const char *ex
 
        LLVMBuildCondBr (ctx->builder, cmp, ex_bb, noex_bb);
 
-       exc_class = mono_class_from_name (mono_get_corlib (), "System", exc_type);
-       g_assert (exc_class);
+       exc_class = mono_class_load_from_name (mono_get_corlib (), "System", exc_type);
 
        /* Emit exception throwing code */
        ctx->builder = builder = create_builder (ctx);

diff --git a/mono/mini/mini-mips.c b/mono/mini/mini-mips.c
index 0b1265e9e7844b744df10536a41500bb5b1038f8..a5453a88e05ca98d64213755782cbbb9bdf325b6 100644 (file)
--- a/mono/mini/mini-mips.c
+++ b/mono/mini/mini-mips.c
@@ -221,8 +221,7 @@ mips_emit_exc_by_name(guint8 *code, const char *name)
        gpointer addr;
        MonoClass *exc_class;
 
-       exc_class = mono_class_from_name (mono_defaults.corlib, "System", name);
-       g_assert (exc_class);
+       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", name);
 
        mips_load_const (code, mips_a0, exc_class->type_token);
        addr = mono_get_throw_corlib_exception ();

diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
index 9e715e2dd71e52383fd04b63f250b2236dbd7ca9..c9116ff46e1e6a974f1e5391de97731bc38bd90e 100644 (file)
--- a/mono/mini/mini-ppc.c
+++ b/mono/mini/mini-ppc.c
@@ -5621,8 +5621,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
                                exc_throw_pos [i] = code;
                        }
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, "System", patch_info->data.name);
-                       g_assert (exc_class);
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", patch_info->data.name);
 
                        ppc_patch (ip, code);
                        /*mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_EXC_NAME, patch_info->data.target);*/

diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c
index a4a7776094c57ab7ee2372e50f8da6d51f4e4d2b..4cf7b4df7ad0a69e069da3f066ad2007e8b29b0e 100644 (file)
--- a/mono/mini/mini-s390x.c
+++ b/mono/mini/mini-s390x.c
@@ -6077,10 +6077,9 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
                        /*-----------------------------------------------------*/
                        s390_patch_rel (ip + 2, (guint64) S390_RELATIVE(code,ip));
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, 
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib,
                                                          "System", 
                                                          patch_info->data.name);
-                       g_assert (exc_class);
                        throw_ip = patch_info->ip.i;
 
                        for (iExc = 0; iExc < nThrows; ++iExc)

diff --git a/mono/mini/mini-sparc.c b/mono/mini/mini-sparc.c
index 7f99809d51f5bbfda35588899c28e3940d0abb3c..f791290851c2f393bee65d55f528c919f7c13dec 100644 (file)
--- a/mono/mini/mini-sparc.c
+++ b/mono/mini/mini-sparc.c
@@ -4208,8 +4208,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 
                        sparc_patch ((guint32*)(cfg->native_code + patch_info->ip.i), code);
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, "System", patch_info->data.name);
-                       g_assert (exc_class);
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", patch_info->data.name);
                        type_idx = exc_class->type_token - MONO_TOKEN_TYPE_DEF;
                        throw_ip = patch_info->ip.i;
 

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index 0407c7cc57e4d6a527a24d3a80d17c7deb754b8c..c772cf21305605e745e101c8e4b7bb8563bb0660 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -5664,8 +5664,7 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 
                        x86_patch (patch_info->ip.i + cfg->native_code, code);
 
-                       exc_class = mono_class_from_name (mono_defaults.corlib, "System", patch_info->data.name);
-                       g_assert (exc_class);
+                       exc_class = mono_class_load_from_name (mono_defaults.corlib, "System", patch_info->data.name);
                        throw_ip = patch_info->ip.i;
 
                        /* Find a throw sequence for the same exception class */