Flush

[mono.git] / mono / jit / emit-x86.c

diff --git a/mono/jit/emit-x86.c b/mono/jit/emit-x86.c
index e14aad8478be5650c58707f636bb63261b5063d3..bbeb063383d03203698b71619751883ce50e694c 100644 (file)
--- a/mono/jit/emit-x86.c
+++ b/mono/jit/emit-x86.c
@@ -24,7 +24,6 @@
 #include "jit.h"
 #include "helpers.h"
 #include "codegen.h"
-#include "debug.h"
 
 
 //#define DEBUG_REGALLOC
@@ -185,6 +184,9 @@ enter_method (MonoMethod *method, char *ebp)
 
        sig = method->signature;
 
+       if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE)
+               g_assert (!sig->pinvoke);
+
        arg_info = alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
 
        arch_get_argument_info (sig, sig->param_count, arg_info);
@@ -725,8 +727,6 @@ mono_label_cfg (MonoFlowGraph *cfg)
                        mbstate =  mono_burg_label (t1, cfg);
 
                        if (!mbstate) {
-                               if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
-                                       return FALSE;
                                g_warning ("tree does not match in %s: 0x%04x",
                                           mono_method_full_name (cfg->method, TRUE), t1->cli_addr);
                                mono_print_ctree (cfg, t1); printf ("\n\n");