[jit] Remove #ifdef MONO_ARCH_VTABLE_REG, it is defined on all architectures.

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index f57289fbb814ca411c75ebd2c2ba01bea8e2e022..71ddbe1a9c116b0dceea743c83e4dd0868427b16 100755 (executable)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -3654,12 +3654,8 @@ emit_generic_class_init (MonoCompile *cfg, MonoClass *klass)
                call = (MonoCallInst*)mono_emit_abs_call (cfg, MONO_PATCH_INFO_GENERIC_CLASS_INIT, NULL, helper_sig_generic_class_init_trampoline_llvm, &vtable_arg);
        else
                call = (MonoCallInst*)mono_emit_abs_call (cfg, MONO_PATCH_INFO_GENERIC_CLASS_INIT, NULL, helper_sig_generic_class_init_trampoline, &vtable_arg);
-#ifdef MONO_ARCH_VTABLE_REG
        mono_call_inst_add_outarg_reg (cfg, call, vtable_arg->dreg, MONO_ARCH_VTABLE_REG, FALSE);
        cfg->uses_vtable_reg = TRUE;
-#else
-       NOT_IMPLEMENTED;
-#endif
 }
 
 static void
@@ -11146,17 +11142,6 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        }
 
                        /* STATIC CASE */
-
-                       /*
-                        * We can only support shared generic static
-                        * field access on architectures where the
-                        * trampoline code has been extended to handle
-                        * the generic class init.
-                        */
-#ifndef MONO_ARCH_VTABLE_REG
-                       GENERIC_SHARING_FAILURE (op);
-#endif
-
                        context_used = mini_class_check_context_used (cfg, klass);
 
                        ftype = mono_field_get_type (field);

diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index 1268f2f10d8fc9a1af46792976e87a43cfdea90d..9aaffddfb25e9fcf537bd32f6dfaef0735d8d68a 100644 (file)
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -939,7 +939,6 @@ mono_generic_class_init_trampoline (mgreg_t *regs, guint8 *code, MonoVTable *vta
 static gpointer
 mono_rgctx_lazy_fetch_trampoline (mgreg_t *regs, guint8 *code, gpointer data, guint8 *tramp)
 {
-#ifdef MONO_ARCH_VTABLE_REG
        static gboolean inited = FALSE;
        static int num_lookups = 0;
        guint32 slot = GPOINTER_TO_UINT (data);
@@ -961,9 +960,6 @@ mono_rgctx_lazy_fetch_trampoline (mgreg_t *regs, guint8 *code, gpointer data, gu
                return mono_method_fill_runtime_generic_context (arg, code, index);
        else
                return mono_class_fill_runtime_generic_context (arg, code, index);
-#else
-       g_assert_not_reached ();
-#endif
 }
 
 void
@@ -1427,7 +1423,6 @@ mono_create_class_init_trampoline (MonoVTable *vtable)
 gpointer
 mono_create_generic_class_init_trampoline (void)
 {
-#ifdef MONO_ARCH_VTABLE_REG
        static gpointer code;
        MonoTrampInfo *info;
 
@@ -1446,9 +1441,6 @@ mono_create_generic_class_init_trampoline (void)
        mono_trampolines_unlock ();
 
        return code;
-#else
-       g_assert_not_reached ();
-#endif
 }
 
 gpointer

diff --git a/mono/mini/tramp-ppc.c b/mono/mini/tramp-ppc.c
index 721ad88cc6cb5506736882598983d0897a92d334..9d465f35139e4b02ae49d4bafba33a3375dae482 100644 (file)
--- a/mono/mini/tramp-ppc.c
+++ b/mono/mini/tramp-ppc.c
@@ -505,7 +505,6 @@ emit_trampoline_jump (guint8 *code, guint8 *tramp)
 gpointer
 mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info, gboolean aot)
 {
-#ifdef MONO_ARCH_VTABLE_REG
        guint8 *tramp;
        guint8 *code, *buf;
        guint8 **rgctx_null_jumps;
@@ -611,9 +610,6 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info
        g_free (name);
 
        return buf;
-#else
-       g_assert_not_reached ();
-#endif
 }
 
 gpointer

diff --git a/mono/mini/tramp-s390x.c b/mono/mini/tramp-s390x.c
index 14a96653d67c2f7f1ffcd2398bf287d29589087e..2b6854849f0dda4d929bcfa4636c251c0f900f92 100644 (file)
--- a/mono/mini/tramp-s390x.c
+++ b/mono/mini/tramp-s390x.c
@@ -508,7 +508,6 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
 gpointer
 mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info, gboolean aot)
 {
-#ifdef MONO_ARCH_VTABLE_REG
        guint8 *tramp;
        guint8 *code, *buf;
        guint8 **rgctx_null_jumps;
@@ -609,10 +608,6 @@ mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info
        g_free (name);
 
        return(buf);
-#else
-       g_assert_not_reached ();
-#endif
-       return(NULL);
 }      
 
 /*========================= End of Function ========================*/