Merge pull request #4570 from lateralusX/jlorenss/visual_studio_msbuild_fix

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

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index fdbf7faea426de7822feae4f9b8ac97dbac522a0..ac9c22f9ae18d14f7161b6730fb43ebaaf6e43fc 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -1,5 +1,6 @@
-/*
- * mini.c: The new Mono code generator.
+/**
+ * \file
+ * The new Mono code generator.
  *
  * Authors:
  *   Paolo Molaro (lupus@ximian.com)
@@ -60,7 +61,6 @@
 #include <mono/utils/dtrace.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-threads-coop.h>
-#include <mono/io-layer/io-layer.h>
 
 #include "mini.h"
 #include "seq-points.h"
@@ -77,6 +77,7 @@
 #include "debugger-agent.h"
 #include "llvm-runtime.h"
 #include "mini-llvm.h"
+#include "lldb.h"
 
 MonoTraceSpec *mono_jit_trace_calls;
 MonoMethodDesc *mono_inject_async_exc_method;
@@ -145,12 +146,6 @@ mono_emit_unwind_op (MonoCompile *cfg, int when, int tag, int reg, int val)
        }
 }
 
-#define MONO_INIT_VARINFO(vi,id) do { \
-       (vi)->range.first_use.pos.bid = 0xffff; \
-       (vi)->reg = -1; \
-        (vi)->idx = (id); \
-} while (0)
-
 /**
  * mono_unlink_bblock:
  *
@@ -680,8 +675,10 @@ mono_compile_create_var_for_vreg (MonoCompile *cfg, MonoType *type, int opcode,
        
        cfg->varinfo [num] = inst;
 
-       MONO_INIT_VARINFO (&cfg->vars [num], num);
-       MONO_VARINFO (cfg, num)->vreg = vreg;
+       cfg->vars [num].idx = num;
+       cfg->vars [num].vreg = vreg;
+       cfg->vars [num].range.first_use.pos.bid = 0xffff;
+       cfg->vars [num].reg = -1;
 
        if (vreg != -1)
                set_vreg_to_inst (cfg, vreg, inst);
@@ -2277,7 +2274,7 @@ mono_codegen (MonoCompile *cfg)
        /* fixme: align to MONO_ARCH_CODE_ALIGNMENT */
 
 #ifdef MONO_ARCH_HAVE_UNWIND_TABLE
-       unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
+       unwindlen = mono_arch_unwindinfo_init_method_unwind_info (cfg);
 #endif
 
        if (cfg->method->dynamic) {
@@ -2398,7 +2395,7 @@ mono_codegen (MonoCompile *cfg)
        mono_debug_close_method (cfg);
 
 #ifdef MONO_ARCH_HAVE_UNWIND_TABLE
-       mono_arch_unwindinfo_install_unwind_info (&cfg->arch.unwindinfo, cfg->native_code, cfg->code_len);
+       mono_arch_unwindinfo_install_method_unwind_info (&cfg->arch.unwindinfo, cfg->native_code, cfg->code_len);
 #endif
 }
 
@@ -3240,7 +3237,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
 
        if (cfg->gen_seq_points)
                cfg->seq_points = g_ptr_array_new ();
-       mono_error_init (&cfg->error);
+       error_init (&cfg->error);
 
        if (cfg->compile_aot && !try_generic_shared && (method->is_generic || mono_class_is_gtd (method->klass) || method_is_gshared)) {
                cfg->exception_type = MONO_EXCEPTION_GENERIC_SHARING_FAILED;
@@ -3282,7 +3279,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
        }
        cfg->method_to_register = method_to_register;
 
-       mono_error_init (&err);
+       error_init (&err);
        sig = mono_method_signature_checked (cfg->method, &err);        
        if (!sig) {
                cfg->exception_type = MONO_EXCEPTION_TYPE_LOAD;
@@ -3608,6 +3605,10 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
                cfg->disable_ssa = TRUE;
        }
 
+       if (cfg->num_varinfo > 10000 && !cfg->llvm_only)
+               /* Disable llvm for overly complex methods */
+               cfg->disable_ssa = TRUE;
+
        if (cfg->opt & MONO_OPT_LOOP) {
                MONO_TIME_TRACK (mono_jit_stats.jit_compile_dominator_info, mono_compile_dominator_info (cfg, MONO_COMP_DOM | MONO_COMP_IDOM));
                MONO_TIME_TRACK (mono_jit_stats.jit_compute_natural_loops, mono_compute_natural_loops (cfg));
@@ -3880,20 +3881,21 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl
        }
 #endif
 
-       if (!cfg->compile_aot)
-               mono_save_xdebug_info (cfg);
-
        MONO_TIME_TRACK (mono_jit_stats.jit_gc_create_gc_map, mini_gc_create_gc_map (cfg));
- 
        MONO_TIME_TRACK (mono_jit_stats.jit_save_seq_point_info, mono_save_seq_point_info (cfg));
 
+       if (!cfg->compile_aot) {
+               mono_save_xdebug_info (cfg);
+               mono_lldb_save_method_info (cfg);
+       }
+
        if (cfg->verbose_level >= 2) {
                char *id =  mono_method_full_name (cfg->method, FALSE);
                mono_disassemble_code (cfg, cfg->native_code, cfg->code_len, id + 3);
                g_free (id);
        }
 
-       if (!cfg->compile_aot) {
+       if (!cfg->compile_aot && !(flags & JIT_FLAG_DISCARD_RESULTS)) {
                mono_domain_lock (cfg->domain);
                mono_jit_info_table_add (cfg->domain, cfg->jit_info);
 
@@ -4065,7 +4067,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
        GTimer *jit_timer;
        MonoMethod *prof_method, *shared;
 
-       mono_error_init (error);
+       error_init (error);
 
        if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
            (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {