Add some debug code to help diagnose a buildbot failure.

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

diff --git a/mono/mini/mini-ia64.c b/mono/mini/mini-ia64.c
index 556118dd14688281df38ff2b4fea6d7c3a0e54e6..cd8937dbf7b624c14529c11e273e1b7b6586e069 100644 (file)
--- a/mono/mini/mini-ia64.c
+++ b/mono/mini/mini-ia64.c
@@ -28,9 +28,6 @@
 #include "jit-icalls.h"
 #include "ir-emit.h"
 
-static gint appdomain_tls_offset = -1;
-static gint thread_tls_offset = -1;
-
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
 #define IS_IMM32(val) ((((guint64)val) >> 32) == 0)
@@ -968,6 +965,9 @@ mono_arch_create_vars (MonoCompile *cfg)
        MonoMethodSignature *sig;
        CallInfo *cinfo;
 
+       if (!strcmp (cfg->method->name, "MoveNextCore") && !strcmp (cfg->method->klass->name, "PredicateIterator"))
+               cfg->verbose_level = 4;
+
        sig = mono_method_signature (cfg->method);
 
        cinfo = get_call_info (cfg, cfg->mempool, sig, FALSE);
@@ -1594,7 +1594,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
 
                        /* Branch opts can eliminate the branch */
                        if (!next || (!(MONO_IS_COND_BRANCH_OP (next) || MONO_IS_COND_EXC (next) || MONO_IS_SETCC (next)))) {
-                               ins->opcode = OP_NOP;
+                               NULLIFY_INS (ins);
                                break;
                        }
 
@@ -1653,7 +1653,7 @@ mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBlock *bb)
 
                        /* Branch opts can eliminate the branch */
                        if (!next || (!(MONO_IS_COND_BRANCH_OP (next) || MONO_IS_COND_EXC (next) || MONO_IS_SETCC (next)))) {
-                               ins->opcode = OP_NOP;
+                               NULLIFY_INS (ins);
                                break;
                        }
 
@@ -4589,17 +4589,9 @@ mono_arch_get_delegate_method_ptr_addr (guint8* code, gpointer *regs)
        return NULL;
 }
 
-static gboolean tls_offset_inited = FALSE;
-
 void
 mono_arch_setup_jit_tls_data (MonoJitTlsData *tls)
 {
-       if (!tls_offset_inited) {
-               tls_offset_inited = TRUE;
-
-               appdomain_tls_offset = mono_domain_get_tls_offset ();
-               thread_tls_offset = mono_thread_get_tls_offset ();
-       }               
 }
 
 void
@@ -4680,7 +4672,7 @@ mono_arch_build_imt_thunk (MonoVTable *vtable, MonoDomain *domain, MonoIMTCheckI
        g_assert (code.buf - buf <= size);
 
        size = code.buf - buf;
-       start = mono_code_manager_reserve (domain->code_mp, size);
+       start = mono_domain_code_reserve (domain, size);
        memcpy (start, buf, size);
 
        mono_arch_flush_icache (start, size);
@@ -4817,28 +4809,16 @@ mono_arch_print_tree (MonoInst *tree, int arity)
        return 0;
 }
 
-MonoInst* mono_arch_get_domain_intrinsic (MonoCompile* cfg)
+MonoInst*
+mono_arch_get_domain_intrinsic (MonoCompile* cfg)
 {
-       MonoInst* ins;
-       
-       if (appdomain_tls_offset == -1)
-               return NULL;
-       
-       MONO_INST_NEW (cfg, ins, OP_TLS_GET);
-       ins->inst_offset = appdomain_tls_offset;
-       return ins;
+       return mono_get_domain_intrinsic (cfg);
 }
 
-MonoInst* mono_arch_get_thread_intrinsic (MonoCompile* cfg)
+MonoInst*
+mono_arch_get_thread_intrinsic (MonoCompile* cfg)
 {
-       MonoInst* ins;
-       
-       if (thread_tls_offset == -1)
-               return NULL;
-       
-       MONO_INST_NEW (cfg, ins, OP_TLS_GET);
-       ins->inst_offset = thread_tls_offset;
-       return ins;
+       return mono_get_thread_intrinsic (cfg);
 }
 
 gpointer