more c*****y windows issues.

[mono.git] / mono / mini / inssel.brg

diff --git a/mono/mini/inssel.brg b/mono/mini/inssel.brg
index 05fe113fad53af7fce075a28cd36793c9e3e8a20..d711d893c412e5bab874d1fe0d425f5fbb078d50 100644 (file)
--- a/mono/mini/inssel.brg
+++ b/mono/mini/inssel.brg
@@ -64,7 +64,7 @@
                 (inst)->opcode = op; \
                 (inst)->dreg = dr; \
                 (inst)->sreg1 = sr; \
-                (inst)->inst_p1 = (gpointer)imm; \
+                (inst)->inst_p1 = (gpointer)(gssize)(imm); \
                mono_bblock_add_inst (cfg->cbb, inst); \
        } while (0)
 
@@ -74,7 +74,7 @@
                 inst->opcode = op; \
                 inst->dreg = dr; \
                 inst->sreg1 = sr; \
-                inst->inst_p1 = (gpointer)imm; \
+                inst->inst_p1 = (gpointer)(gssize)(imm); \
                mono_bblock_add_inst (cfg->cbb, inst); \
        } while (0)
 
@@ -1048,9 +1048,22 @@ reg: CEE_ISINST (reg) {
                                mini_emit_isninst_cast (s, eclass_reg, klass->cast_class, false_label, object_is_null);
                        }
                } else {
-                       MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
-                       /* the object_is_null target simply copies the input register to the output */
-                       mini_emit_isninst_cast (s, klass_reg, klass, false_label, object_is_null);
+                       if (!s->compile_aot && !(s->opt & MONO_OPT_SHARED) && (klass->flags & TYPE_ATTRIBUTE_SEALED)) {
+                               /* the remoting code is broken, access the class for now */
+                               if (0) {
+                                       MonoVTable *vt = mono_class_vtable (s->domain, klass);
+                                       MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, vtable_reg, vt);
+                               } else {
+                                       MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
+                                       MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, klass);
+                               }
+                               MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BNE_UN, false_label);
+                               MONO_EMIT_NEW_BRANCH_LABEL (s, CEE_BR, object_is_null);
+                       } else {
+                               MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
+                               /* the object_is_null target simply copies the input register to the output */
+                               mini_emit_isninst_cast (s, klass_reg, klass, false_label, object_is_null);
+                       }
                }
        }
 
@@ -1194,15 +1207,15 @@ reg: CEE_CASTCLASS (reg) {
                int klass_reg = mono_regstate_next_int (s->rs);
 
                MONO_EMIT_NEW_LOAD_MEMBASE (s, vtable_reg, obj_reg, G_STRUCT_OFFSET (MonoObject, vtable));
-               MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
 
                if (klass->rank) {
                        int rank_reg = mono_regstate_next_int (s->rs);
                        int eclass_reg = mono_regstate_next_int (s->rs);
 
-                       MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADU1_MEMBASE, rank_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, rank));
+                       MONO_EMIT_NEW_LOAD_MEMBASE_OP (s, OP_LOADU1_MEMBASE, rank_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, rank));
                        MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, rank_reg, klass->rank);
                        MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException");
+                       MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
                        MONO_EMIT_NEW_LOAD_MEMBASE (s, eclass_reg, klass_reg, G_STRUCT_OFFSET (MonoClass, cast_class));
                        if (klass->cast_class == mono_defaults.object_class) {
                                int parent_reg = mono_regstate_next_int (s->rs);
@@ -1262,7 +1275,20 @@ reg: CEE_CASTCLASS (reg) {
                                MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException");
                        }
                } else {
-                       mini_emit_castclass (s, klass_reg, klass);
+                       if (!s->compile_aot && !(s->opt & MONO_OPT_SHARED) && (klass->flags & TYPE_ATTRIBUTE_SEALED)) {
+                               /* the remoting code is broken, access the class for now */
+                               if (0) {
+                                       MonoVTable *vt = mono_class_vtable (s->domain, klass);
+                                       MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, vtable_reg, vt);
+                               } else {
+                                       MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
+                                       MONO_EMIT_NEW_BIALU_IMM (s, OP_COMPARE_IMM, -1, klass_reg, klass);
+                               }
+                               MONO_EMIT_NEW_COND_EXC (s, NE_UN, "InvalidCastException");
+                       } else {
+                               MONO_EMIT_NEW_LOAD_MEMBASE (s, klass_reg, vtable_reg, G_STRUCT_OFFSET (MonoVTable, klass));
+                               mini_emit_castclass (s, klass_reg, klass);
+                       }
                }
        }
 
@@ -1407,12 +1433,7 @@ reg: OP_GETTYPE (reg) {
 reg: OP_GETHASHCODE (reg) {
        int t1 = mono_regstate_next_int (s->rs);
        
-       #if HAVE_BOEHM_GC
        #define MONO_OBJECT_ALIGNMENT_SHIFT     3
-       #else
-       #define MONO_OBJECT_ALIGNMENT_SHIFT     2
-       #endif
-
 
        /* return (GPOINTER_TO_UINT (this) >> MONO_OBJECT_ALIGNMENT_SHIFT) * 2654435761u; */
        
@@ -1616,13 +1637,22 @@ mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop
        MonoMethod *method = ((MonoCallInst*)tree)->method;
        int vtable_reg, slot_reg, this_reg;
        MBState *state = st;
+       gboolean enable_for_aot = TRUE;
 
        this_reg = state->left->reg1;
        mono_arch_emit_this_vret_args (cfg, (MonoCallInst*)tree, this_reg, state->left->tree->type, novirtop == OP_VCALL? state->right->reg1: -1);
 
-       if (!(method->flags & METHOD_ATTRIBUTE_VIRTUAL) || 
-           ((method->flags & METHOD_ATTRIBUTE_FINAL) && 
-            method->wrapper_type != MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK)) {
+#ifdef MONO_ARCH_NEED_GOT_VAR
+       /* Can't create a got var at this point */
+       enable_for_aot = cfg->got_var != NULL;
+#else
+       enable_for_aot = TRUE;
+#endif
+
+       if ((!cfg->compile_aot || enable_for_aot) && 
+               (!(method->flags & METHOD_ATTRIBUTE_VIRTUAL) || 
+            ((method->flags & METHOD_ATTRIBUTE_FINAL) && 
+            method->wrapper_type != MONO_WRAPPER_REMOTING_INVOKE_WITH_CHECK))) {
                /* 
                 * the method is not virtual, we just need to ensure this is not null
                 * and then we can call the method directly.
@@ -1640,6 +1670,9 @@ mini_emit_virtual_call (MonoCompile *cfg, void *st, MonoInst *tree, int novirtop
                return;
        }
 
+       /* Initialize method->slot */
+       mono_class_setup_vtable (method->klass);
+
        vtable_reg = mono_regstate_next_int (cfg->rs);
        MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, this_reg, G_STRUCT_OFFSET (MonoObject, vtable));
        if (method->klass->flags & TYPE_ATTRIBUTE_INTERFACE) {