Merge pull request #2921 from lewurm/lower-typechecks-later

[mono.git] / mono / mini / mini-codegen.c

diff --git a/mono/mini/mini-codegen.c b/mono/mini/mini-codegen.c
index db26f1b5c523fb34ec53fe186b302ffbcbd4c2d3..57a7a38deef9f7845a8aaf94024d58955698e06e 100644 (file)
--- a/mono/mini/mini-codegen.c
+++ b/mono/mini/mini-codegen.c
@@ -535,6 +535,10 @@ mono_print_ins_index_strbuf (int i, MonoInst *ins)
                case OP_GSHAREDVT_ARG_REGOFFSET:
                        g_string_append_printf (sbuf, " + 0x%lx", (long)ins->inst_offset);
                        break;
+               case OP_ISINST:
+               case OP_CASTCLASS:
+                       g_string_append_printf (sbuf, " %s", ins->klass->name);
+                       break;
                default:
                        break;
                }
@@ -722,6 +726,36 @@ mono_print_ins_index_strbuf (int i, MonoInst *ins)
        case OP_SEQ_POINT:
                g_string_append_printf (sbuf, " il: 0x%x%s", (int)ins->inst_imm, ins->flags & MONO_INST_NONEMPTY_STACK ? ", nonempty-stack" : "");
                break;
+       case OP_COND_EXC_EQ:
+       case OP_COND_EXC_GE:
+       case OP_COND_EXC_GT:
+       case OP_COND_EXC_LE:
+       case OP_COND_EXC_LT:
+       case OP_COND_EXC_NE_UN:
+       case OP_COND_EXC_GE_UN:
+       case OP_COND_EXC_GT_UN:
+       case OP_COND_EXC_LE_UN:
+       case OP_COND_EXC_LT_UN:
+       case OP_COND_EXC_OV:
+       case OP_COND_EXC_NO:
+       case OP_COND_EXC_C:
+       case OP_COND_EXC_NC:
+       case OP_COND_EXC_IEQ:
+       case OP_COND_EXC_IGE:
+       case OP_COND_EXC_IGT:
+       case OP_COND_EXC_ILE:
+       case OP_COND_EXC_ILT:
+       case OP_COND_EXC_INE_UN:
+       case OP_COND_EXC_IGE_UN:
+       case OP_COND_EXC_IGT_UN:
+       case OP_COND_EXC_ILE_UN:
+       case OP_COND_EXC_ILT_UN:
+       case OP_COND_EXC_IOV:
+       case OP_COND_EXC_INO:
+       case OP_COND_EXC_IC:
+       case OP_COND_EXC_INC:
+               g_string_append_printf (sbuf, " %s", ins->inst_p1);
+               break;
        default:
                break;
        }
@@ -851,11 +885,6 @@ spill_vreg (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst **last, MonoInst *ins
                mono_regstate_free_int (rs, sel);
 }
 
-/* This isn't defined on older glib versions and on some platforms */
-#ifndef G_GUINT64_FORMAT
-#define G_GUINT64_FORMAT "ul"
-#endif
-
 static int
 get_register_spilling (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst **last, MonoInst *ins, regmask_t regmask, int reg, int bank)
 {