[jit] Remove unmaintained ssapre.c/h file.
[mono.git] / mono / mini / mini.c
index 2e7036bec6eda35bd774be548ddf1ea9be4a7990..b50de18bcb533023a26f00f042adea87a494566b 100755 (executable)
@@ -10,7 +10,6 @@
  * Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
  */
 
-#define MONO_LLVM_IN_MINI 1
 #include <config.h>
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
@@ -22,9 +21,6 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
 
 #include <mono/utils/memcheck.h>
 
@@ -38,7 +34,6 @@
 #include <mono/metadata/threads.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/debug-helpers.h>
-#include <mono/io-layer/io-layer.h>
 #include "mono/metadata/profiler.h"
 #include <mono/metadata/profiler-private.h>
 #include <mono/metadata/mono-config.h>
@@ -51,7 +46,6 @@
 #include <mono/metadata/mempool-internals.h>
 #include <mono/metadata/attach.h>
 #include <mono/metadata/runtime.h>
-#include <mono/metadata/mono-debug-debugger.h>
 #include <mono/utils/mono-math.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-counters.h>
 #include <mono/utils/mono-tls.h>
 #include <mono/utils/mono-hwcap.h>
 #include <mono/utils/dtrace.h>
-#include <mono/utils/mono-signal-handler.h>
 #include <mono/utils/mono-threads.h>
+#include <mono/io-layer/io-layer.h>
 
 #include "mini.h"
 #include "seq-points.h"
-#include "mini-llvm.h"
 #include "tasklets.h"
 #include <string.h>
 #include <ctype.h>
 
 #include "mini-gc.h"
 #include "debugger-agent.h"
-#include "seq-points.h"
-
-static gpointer mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoException **ex);
-
-
-static guint32 default_opt = 0;
-static gboolean default_opt_set = FALSE;
-
-MonoNativeTlsKey mono_jit_tls_id;
-
-#ifdef MONO_HAVE_FAST_TLS
-MONO_FAST_TLS_DECLARE(mono_jit_tls);
-#endif
 
 MonoTraceSpec *mono_jit_trace_calls;
-gboolean mono_compile_aot = FALSE;
-/* If this is set, no code is generated dynamically, everything is taken from AOT files */
-gboolean mono_aot_only = FALSE;
-/* Whenever to use IMT */
-gboolean mono_use_imt = TRUE;
 MonoMethodDesc *mono_inject_async_exc_method;
 int mono_inject_async_exc_pos;
 MonoMethodDesc *mono_break_at_bb_method;
 int mono_break_at_bb_bb_num;
 gboolean mono_do_x86_stack_align = TRUE;
-const char *mono_build_date;
-gboolean mono_do_signal_chaining;
-gboolean mono_do_crash_chaining;
-static gboolean        mono_using_xdebug;
-static int mini_verbose = 0;
-
-/*
- * This flag controls whenever the runtime uses LLVM for JIT compilation, and whenever
- * it can load AOT code compiled by LLVM.
- */
-gboolean mono_use_llvm = FALSE;
+gboolean mono_using_xdebug;
 
 #define mono_jit_lock() mono_mutex_lock (&jit_mutex)
 #define mono_jit_unlock() mono_mutex_unlock (&jit_mutex)
 static mono_mutex_t jit_mutex;
 
-static MonoCodeManager *global_codeman;
-
-static GHashTable *jit_icall_name_hash;
-
-static MonoDebugOptions debug_options;
-
-#ifdef VALGRIND_JIT_REGISTER_MAP
-static int valgrind_register = 0;
-#endif
-
-/*
- * Table written to by the debugger with a 1-based index into the
- * mono_breakpoint_info table, which contains changes made to
- * the JIT instructions by the debugger.
- */
-gssize
-mono_breakpoint_info_index [MONO_BREAKPOINT_ARRAY_SIZE];
-
 /* Whenever to check for pending exceptions in managed-to-native wrappers */
 gboolean check_for_pending_exc = TRUE;
 
-/* Whenever to disable passing/returning small valuetypes in registers for managed methods */
-gboolean disable_vtypes_in_regs = FALSE;
-
-static GSList *tramp_infos;
-
-static void register_icalls (void);
-
 gpointer
 mono_realloc_native_code (MonoCompile *cfg)
 {
@@ -259,316 +199,12 @@ void mono_nacl_fix_patches(const guint8 *code, MonoJumpInfo *ji)
 }
 #endif  /* __native_client_codegen__ */
 
-gboolean
-mono_running_on_valgrind (void)
-{
-       if (RUNNING_ON_VALGRIND){
-#ifdef VALGRIND_JIT_REGISTER_MAP
-               valgrind_register = TRUE;
-#endif
-               return TRUE;
-       } else
-               return FALSE;
-}
-
 typedef struct {
        MonoExceptionClause *clause;
        MonoBasicBlock *basic_block;
        int start_offset;
 } TryBlockHole;
 
-typedef struct {
-       void *ip;
-       MonoMethod *method;
-} FindTrampUserData;
-
-static void
-find_tramp (gpointer key, gpointer value, gpointer user_data)
-{
-       FindTrampUserData *ud = (FindTrampUserData*)user_data;
-
-       if (value == ud->ip)
-               ud->method = (MonoMethod*)key;
-}
-
-/* debug function */
-G_GNUC_UNUSED static char*
-get_method_from_ip (void *ip)
-{
-       MonoJitInfo *ji;
-       char *method;
-       char *res;
-       MonoDomain *domain = mono_domain_get ();
-       MonoDebugSourceLocation *location;
-       FindTrampUserData user_data;
-
-       if (!domain)
-               domain = mono_get_root_domain ();
-
-       ji = mono_jit_info_table_find (domain, ip);
-       if (!ji) {
-               user_data.ip = ip;
-               user_data.method = NULL;
-               mono_domain_lock (domain);
-               g_hash_table_foreach (domain_jit_info (domain)->jit_trampoline_hash, find_tramp, &user_data);
-               mono_domain_unlock (domain);
-               if (user_data.method) {
-                       char *mname = mono_method_full_name (user_data.method, TRUE);
-                       res = g_strdup_printf ("<%p - JIT trampoline for %s>", ip, mname);
-                       g_free (mname);
-                       return res;
-               }
-               else
-                       return NULL;
-       }
-       method = mono_method_full_name (jinfo_get_method (ji), TRUE);
-       /* FIXME: unused ? */
-       location = mono_debug_lookup_source_location (jinfo_get_method (ji), (guint32)((guint8*)ip - (guint8*)ji->code_start), domain);
-
-       res = g_strdup_printf (" %s + 0x%x (%p %p) [%p - %s]", method, (int)((char*)ip - (char*)ji->code_start), ji->code_start, (char*)ji->code_start + ji->code_size, domain, domain->friendly_name);
-
-       mono_debug_free_source_location (location);
-       g_free (method);
-
-       return res;
-}
-
-/** 
- * mono_pmip:
- * @ip: an instruction pointer address
- *
- * This method is used from a debugger to get the name of the
- * method at address @ip.   This routine is typically invoked from
- * a debugger like this:
- *
- * (gdb) print mono_pmip ($pc)
- *
- * Returns: the name of the method at address @ip.
- */
-G_GNUC_UNUSED char *
-mono_pmip (void *ip)
-{
-       return get_method_from_ip (ip);
-}
-
-/** 
- * mono_print_method_from_ip
- * @ip: an instruction pointer address
- *
- * This method is used from a debugger to get the name of the
- * method at address @ip.
- *
- * This prints the name of the method at address @ip in the standard
- * output.  Unlike mono_pmip which returns a string, this routine
- * prints the value on the standard output. 
- */
-#ifdef __GNUC__
-/* Prevent the linker from optimizing this away in embedding setups to help debugging */
- __attribute__((used))
-#endif
-void
-mono_print_method_from_ip (void *ip)
-{
-       MonoJitInfo *ji;
-       char *method;
-       MonoDebugSourceLocation *source;
-       MonoDomain *domain = mono_domain_get ();
-       MonoDomain *target_domain = mono_domain_get ();
-       FindTrampUserData user_data;
-       MonoGenericSharingContext*gsctx;
-       const char *shared_type;
-       GSList *l;
-       
-       ji = mini_jit_info_table_find (domain, ip, &target_domain);
-       if (!ji) {
-               user_data.ip = ip;
-               user_data.method = NULL;
-               mono_domain_lock (domain);
-               g_hash_table_foreach (domain_jit_info (domain)->jit_trampoline_hash, find_tramp, &user_data);
-               mono_domain_unlock (domain);
-               if (user_data.method) {
-                       char *mname = mono_method_full_name (user_data.method, TRUE);
-                       printf ("IP %p is a JIT trampoline for %s\n", ip, mname);
-                       g_free (mname);
-                       return;
-               }
-               for (l = tramp_infos; l; l = l->next) {
-                       MonoTrampInfo *tinfo = l->data;
-
-                       if ((guint8*)ip >= tinfo->code && (guint8*)ip <= tinfo->code + tinfo->code_size) {
-                               printf ("IP %p is at offset 0x%x of trampoline '%s'.\n", ip, (int)((guint8*)ip - tinfo->code), tinfo->name);
-                               return;
-                       }
-               }
-
-               g_print ("No method at %p\n", ip);
-               fflush (stdout);
-               return;
-       }
-       method = mono_method_full_name (jinfo_get_method (ji), TRUE);
-       source = mono_debug_lookup_source_location (jinfo_get_method (ji), (guint32)((guint8*)ip - (guint8*)ji->code_start), target_domain);
-
-       gsctx = mono_jit_info_get_generic_sharing_context (ji);
-       shared_type = "";
-       if (gsctx) {
-               if (gsctx->var_is_vt || gsctx->mvar_is_vt)
-                       shared_type = "gsharedvt ";
-               else
-                       shared_type = "gshared ";
-       }
-
-       g_print ("IP %p at offset 0x%x of %smethod %s (%p %p)[domain %p - %s]\n", ip, (int)((char*)ip - (char*)ji->code_start), shared_type, method, ji->code_start, (char*)ji->code_start + ji->code_size, target_domain, target_domain->friendly_name);
-
-       if (source)
-               g_print ("%s:%d\n", source->source_file, source->row);
-       fflush (stdout);
-
-       mono_debug_free_source_location (source);
-       g_free (method);
-}
-       
-/* 
- * mono_method_same_domain:
- *
- * Determine whenever two compiled methods are in the same domain, thus
- * the address of the callee can be embedded in the caller.
- */
-gboolean mono_method_same_domain (MonoJitInfo *caller, MonoJitInfo *callee)
-{
-       MonoMethod *cmethod;
-
-       if (!caller || !callee)
-               return FALSE;
-
-       /*
-        * If the call was made from domain-neutral to domain-specific 
-        * code, we can't patch the call site.
-        */
-       if (caller->domain_neutral && !callee->domain_neutral)
-               return FALSE;
-
-       cmethod = jinfo_get_method (caller);
-       if ((cmethod->klass == mono_defaults.appdomain_class) &&
-               (strstr (cmethod->name, "InvokeInDomain"))) {
-                /* The InvokeInDomain methods change the current appdomain */
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
-/*
- * mono_global_codeman_reserve:
- *
- *  Allocate code memory from the global code manager.
- */
-void *mono_global_codeman_reserve (int size)
-{
-       void *ptr;
-
-       if (mono_aot_only)
-               g_error ("Attempting to allocate from the global code manager while running with --aot-only.\n");
-
-       if (!global_codeman) {
-               /* This can happen during startup */
-               global_codeman = mono_code_manager_new ();
-               return mono_code_manager_reserve (global_codeman, size);
-       }
-       else {
-               mono_jit_lock ();
-               ptr = mono_code_manager_reserve (global_codeman, size);
-               mono_jit_unlock ();
-               return ptr;
-       }
-}
-
-#if defined(__native_client_codegen__) && defined(__native_client__)
-void
-mono_nacl_gc()
-{
-#ifdef __native_client_gc__
-       __nacl_suspend_thread_if_needed();
-#endif
-}
-
-/* Given the temporary buffer (allocated by mono_global_codeman_reserve) into
- * which we are generating code, return a pointer to the destination in the
- * dynamic code segment into which the code will be copied when
- * mono_global_codeman_commit is called.
- * LOCKING: Acquires the jit lock.
- */
-void*
-nacl_global_codeman_get_dest (void *data)
-{
-       void *dest;
-       mono_jit_lock ();
-       dest = nacl_code_manager_get_code_dest (global_codeman, data);
-       mono_jit_unlock ();
-       return dest;
-}
-
-void
-mono_global_codeman_commit (void *data, int size, int newsize)
-{
-       mono_jit_lock ();
-       mono_code_manager_commit (global_codeman, data, size, newsize);
-       mono_jit_unlock ();
-}
-
-/* 
- * Convenience function which calls mono_global_codeman_commit to validate and
- * copy the code. The caller sets *buf_base and *buf_size to the start and size
- * of the buffer (allocated by mono_global_codeman_reserve), and *code_end to
- * the byte after the last instruction byte. On return, *buf_base will point to
- * the start of the copied in the code segment, and *code_end will point after
- * the end of the copied code.
- */
-void
-nacl_global_codeman_validate (guint8 **buf_base, int buf_size, guint8 **code_end)
-{
-       guint8 *tmp = nacl_global_codeman_get_dest (*buf_base);
-       mono_global_codeman_commit (*buf_base, buf_size, *code_end - *buf_base);
-       *code_end = tmp + (*code_end - *buf_base);
-       *buf_base = tmp;
-}
-#else
-/* no-op versions of Native Client functions */
-void*
-nacl_global_codeman_get_dest (void *data)
-{
-       return data;
-}
-
-void
-mono_global_codeman_commit (void *data, int size, int newsize)
-{
-}
-
-void
-nacl_global_codeman_validate (guint8 **buf_base, int buf_size, guint8 **code_end)
-{
-}
-
-#endif /* __native_client__ */
-
-/**
- * mono_create_unwind_op:
- *
- *   Create an unwind op with the given parameters.
- */
-MonoUnwindOp*
-mono_create_unwind_op (int when, int tag, int reg, int val)
-{
-       MonoUnwindOp *op = g_new0 (MonoUnwindOp, 1);
-
-       op->op = tag;
-       op->reg = reg;
-       op->val = val;
-       op->when = when;
-
-       return op;
-}
-
 /**
  * mono_emit_unwind_op:
  *
@@ -604,139 +240,6 @@ mono_emit_unwind_op (MonoCompile *cfg, int when, int tag, int reg, int val)
        }
 }
 
-MonoJumpInfoToken *
-mono_jump_info_token_new2 (MonoMemPool *mp, MonoImage *image, guint32 token, MonoGenericContext *context)
-{
-       MonoJumpInfoToken *res = mono_mempool_alloc0 (mp, sizeof (MonoJumpInfoToken));
-       res->image = image;
-       res->token = token;
-       res->has_context = context != NULL;
-       if (context)
-               memcpy (&res->context, context, sizeof (MonoGenericContext));
-
-       return res;
-}
-
-MonoJumpInfoToken *
-mono_jump_info_token_new (MonoMemPool *mp, MonoImage *image, guint32 token)
-{
-       return mono_jump_info_token_new2 (mp, image, token, NULL);
-}
-/*
- * mono_tramp_info_create:
- *
- *   Create a MonoTrampInfo structure from the arguments. This function assumes ownership
- * of JI, and UNWIND_OPS.
- */
-MonoTrampInfo*
-mono_tramp_info_create (const char *name, guint8 *code, guint32 code_size, MonoJumpInfo *ji, GSList *unwind_ops)
-{
-       MonoTrampInfo *info = g_new0 (MonoTrampInfo, 1);
-
-       info->name = g_strdup ((char*)name);
-       info->code = code;
-       info->code_size = code_size;
-       info->ji = ji;
-       info->unwind_ops = unwind_ops;
-
-       return info;
-}
-
-void
-mono_tramp_info_free (MonoTrampInfo *info)
-{
-       GSList *l;
-
-       g_free (info->name);
-
-       // FIXME: ji
-       for (l = info->unwind_ops; l; l = l->next)
-               g_free (l->data);
-       g_slist_free (info->unwind_ops);
-       g_free (info);
-}
-
-/*
- * mono_tramp_info_register:
- *
- * Remember INFO for use by xdebug, mono_print_method_from_ip (), jit maps, etc.
- * INFO can be NULL.
- * Frees INFO.
- */
-void
-mono_tramp_info_register (MonoTrampInfo *info)
-{
-       MonoTrampInfo *copy;
-
-       if (!info)
-               return;
-
-       copy = g_new0 (MonoTrampInfo, 1);
-       copy->code = info->code;
-       copy->code_size = info->code_size;
-       copy->name = g_strdup (info->name);
-
-       mono_jit_lock ();
-       tramp_infos = g_slist_prepend (tramp_infos, copy);
-       mono_jit_unlock ();
-
-       mono_save_trampoline_xdebug_info (info);
-
-       if (mono_jit_map_is_enabled ())
-               mono_emit_jit_tramp (info->code, info->code_size, info->name);
-
-       mono_tramp_info_free (info);
-}
-
-static void
-mono_tramp_info_cleanup (void)
-{
-       GSList *l;
-
-       for (l = tramp_infos; l; l = l->next) {
-               MonoTrampInfo *info = l->data;
-
-               mono_tramp_info_free (info);
-       }
-       g_slist_free (tramp_infos);
-}
-
-G_GNUC_UNUSED static void
-break_count (void)
-{
-}
-
-/*
- * Runtime debugging tool, use if (debug_count ()) <x> else <y> to do <x> the first COUNT times, then do <y> afterwards.
- * Set a breakpoint in break_count () to break the last time <x> is done.
- */
-G_GNUC_UNUSED gboolean
-mono_debug_count (void)
-{
-       static int count = 0;
-       static gboolean inited;
-       static const char *value;
-
-       count ++;
-
-       if (!inited) {
-               value = g_getenv ("COUNT");
-               inited = TRUE;
-       }
-
-       if (!value)
-               return TRUE;
-
-       if (count == atoi (value))
-               break_count ();
-
-       if (count > atoi (value))
-               return FALSE;
-
-       return TRUE;
-}
-
 #define MONO_INIT_VARINFO(vi,id) do { \
        (vi)->range.first_use.pos.bid = 0xffff; \
        (vi)->reg = -1; \
@@ -920,20 +423,15 @@ mono_reverse_branch_op (guint32 opcode)
 guint
 mono_type_to_store_membase (MonoCompile *cfg, MonoType *type)
 {
-       if (type->byref)
-               return OP_STORE_MEMBASE_REG;
-
-       type = mini_replace_type (type);
+       type = mini_get_underlying_type (cfg, type);
 
 handle_enum:
        switch (type->type) {
        case MONO_TYPE_I1:
        case MONO_TYPE_U1:
-       case MONO_TYPE_BOOLEAN:
                return OP_STOREI1_MEMBASE_REG;
        case MONO_TYPE_I2:
        case MONO_TYPE_U2:
-       case MONO_TYPE_CHAR:
                return OP_STOREI2_MEMBASE_REG;
        case MONO_TYPE_I4:
        case MONO_TYPE_U4:
@@ -971,10 +469,8 @@ handle_enum:
                goto handle_enum;
        case MONO_TYPE_VAR:
        case MONO_TYPE_MVAR:
-               if (mini_type_var_is_vt (cfg, type))
-                       return OP_STOREV_MEMBASE;
-               else
-                       return OP_STORE_MEMBASE_REG;
+               g_assert (mini_type_var_is_vt (cfg, type));
+               return OP_STOREV_MEMBASE;
        default:
                g_error ("unknown type 0x%02x in type_to_store_membase", type->type);
        }
@@ -984,21 +480,16 @@ handle_enum:
 guint
 mono_type_to_load_membase (MonoCompile *cfg, MonoType *type)
 {
-       if (type->byref)
-               return OP_LOAD_MEMBASE;
-
-       type = mini_replace_type (type);
+       type = mini_get_underlying_type (cfg, type);
 
        switch (type->type) {
        case MONO_TYPE_I1:
                return OP_LOADI1_MEMBASE;
        case MONO_TYPE_U1:
-       case MONO_TYPE_BOOLEAN:
                return OP_LOADU1_MEMBASE;
        case MONO_TYPE_I2:
                return OP_LOADI2_MEMBASE;
        case MONO_TYPE_U2:
-       case MONO_TYPE_CHAR:
                return OP_LOADU2_MEMBASE;
        case MONO_TYPE_I4:
                return OP_LOADI4_MEMBASE;
@@ -1036,10 +527,8 @@ mono_type_to_load_membase (MonoCompile *cfg, MonoType *type)
        case MONO_TYPE_VAR:
        case MONO_TYPE_MVAR:
                g_assert (cfg->generic_sharing_context);
-               if (mini_type_var_is_vt (cfg, type))
-                       return OP_LOADV_MEMBASE;
-               else
-                       return OP_LOAD_MEMBASE;
+               g_assert (mini_type_var_is_vt (cfg, type));
+               return OP_LOADV_MEMBASE;
        default:
                g_error ("unknown type 0x%02x in type_to_load_membase", type->type);
        }
@@ -1049,13 +538,10 @@ mono_type_to_load_membase (MonoCompile *cfg, MonoType *type)
 static guint
 mini_type_to_ldind (MonoCompile* cfg, MonoType *type)
 {
-       if (cfg->generic_sharing_context && !type->byref) {
-               if (type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR) {
-                       if (mini_type_var_is_vt (cfg, type))
-                               return CEE_LDOBJ;
-                       else
-                               return CEE_LDIND_REF;
-               }
+       type = mini_get_underlying_type (cfg, type);
+       if (cfg->generic_sharing_context && !type->byref && (type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR)) {
+               g_assert (mini_type_var_is_vt (cfg, type));
+               return CEE_LDOBJ;
        }
        return mono_type_to_ldind (type);
 }
@@ -1065,15 +551,10 @@ mini_type_to_ldind (MonoCompile* cfg, MonoType *type)
 guint
 mini_type_to_stind (MonoCompile* cfg, MonoType *type)
 {
-       type = mini_replace_type (type);
-
-       if (cfg->generic_sharing_context && !type->byref) {
-               if (type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR) {
-                       if (mini_type_var_is_vt (cfg, type))
-                               return CEE_STOBJ;
-                       else
-                               return CEE_STIND_REF;
-               }
+       type = mini_get_underlying_type (cfg, type);
+       if (cfg->generic_sharing_context && !type->byref && (type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR)) {
+               g_assert (mini_type_var_is_vt (cfg, type));
+               return CEE_STOBJ;
        }
        return mono_type_to_stind (type);
 }
@@ -1248,7 +729,7 @@ mono_compile_create_var_for_vreg (MonoCompile *cfg, MonoType *type, int opcode,
        int num = cfg->num_varinfo;
        gboolean regpair;
 
-       type = mini_replace_type (type);
+       type = mini_get_underlying_type (cfg, type);
 
        if ((num + 1) >= cfg->varinfo_count) {
                int orig_count = cfg->varinfo_count;
@@ -1276,8 +757,7 @@ mono_compile_create_var_for_vreg (MonoCompile *cfg, MonoType *type, int opcode,
                if (type->byref) {
                        mono_mark_vreg_as_mp (cfg, vreg);
                } else {
-                       MonoType *t = mini_replace_type (type);
-                       if ((MONO_TYPE_ISSTRUCT (t) && inst->klass->has_references) || mini_type_is_reference (cfg, t)) {
+                       if ((MONO_TYPE_ISSTRUCT (type) && inst->klass->has_references) || mini_type_is_reference (cfg, type)) {
                                inst->flags |= MONO_INST_GC_TRACK;
                                mono_mark_vreg_as_ref (cfg, vreg);
                        }
@@ -1358,7 +838,7 @@ MonoInst*
 mono_compile_create_var (MonoCompile *cfg, MonoType *type, int opcode)
 {
        int dreg;
-       type = mini_replace_type (type);
+       type = mini_get_underlying_type (cfg, type);
 
        if (mono_type_is_long (type))
                dreg = mono_alloc_dreg (cfg, STACK_I8);
@@ -1375,7 +855,8 @@ mono_compile_create_var (MonoCompile *cfg, MonoType *type, int opcode)
  * Transform a MonoInst into a load from the variable of index var_index.
  */
 void
-mono_compile_make_var_load (MonoCompile *cfg, MonoInst *dest, gssize var_index) {
+mono_compile_make_var_load (MonoCompile *cfg, MonoInst *dest, gssize var_index)
+{
        memset (dest, 0, sizeof (MonoInst));
        dest->inst_i0 = cfg->varinfo [var_index];
        dest->opcode = mini_type_to_ldind (cfg, dest->inst_i0->inst_vtype);
@@ -1510,7 +991,7 @@ mono_add_ins_to_end (MonoBasicBlock *bb, MonoInst *inst)
                                /* Only two instructions */
                                opcode = bb->code->opcode;
 
-                               if ((opcode == OP_COMPARE) || (opcode == OP_COMPARE_IMM) || (opcode == OP_ICOMPARE) || (opcode == OP_ICOMPARE_IMM) || (opcode == OP_FCOMPARE) || (opcode == OP_LCOMPARE) || (opcode == OP_LCOMPARE_IMM)) {
+                               if ((opcode == OP_COMPARE) || (opcode == OP_COMPARE_IMM) || (opcode == OP_ICOMPARE) || (opcode == OP_ICOMPARE_IMM) || (opcode == OP_FCOMPARE) || (opcode == OP_LCOMPARE) || (opcode == OP_LCOMPARE_IMM) || (opcode == OP_RCOMPARE)) {
                                        /* NEW IR */
                                        mono_bblock_insert_before_ins (bb, bb->code, inst);
                                } else {
@@ -1519,7 +1000,7 @@ mono_add_ins_to_end (MonoBasicBlock *bb, MonoInst *inst)
                        } else {
                                opcode = bb->last_ins->prev->opcode;
 
-                               if ((opcode == OP_COMPARE) || (opcode == OP_COMPARE_IMM) || (opcode == OP_ICOMPARE) || (opcode == OP_ICOMPARE_IMM) || (opcode == OP_FCOMPARE) || (opcode == OP_LCOMPARE) || (opcode == OP_LCOMPARE_IMM)) {
+                               if ((opcode == OP_COMPARE) || (opcode == OP_COMPARE_IMM) || (opcode == OP_ICOMPARE) || (opcode == OP_ICOMPARE_IMM) || (opcode == OP_FCOMPARE) || (opcode == OP_LCOMPARE) || (opcode == OP_LCOMPARE_IMM) || (opcode == OP_RCOMPARE)) {
                                        /* NEW IR */
                                        mono_bblock_insert_before_ins (bb, bb->last_ins->prev, inst);
                                } else {
@@ -1606,8 +1087,6 @@ mono_get_array_new_va_icall (int rank)
                esig = mono_get_array_new_va_signature (rank);
                name = g_strdup (icall_name);
                info = mono_register_jit_icall (mono_array_new_va, name, esig, FALSE);
-
-               g_hash_table_insert (jit_icall_name_hash, name, name);
        }
        mono_jit_unlock ();
 
@@ -1716,70 +1195,18 @@ mono_compile_is_broken (MonoCompile *cfg, MonoMethod *method, gboolean fail_comp
        return !dont_verify && mini_method_verify (cfg, method_definition, fail_compile);
 }
 
-static gconstpointer
-mono_icall_get_wrapper_full (MonoJitICallInfo* callinfo, gboolean do_compile)
+static void
+mono_dynamic_code_hash_insert (MonoDomain *domain, MonoMethod *method, MonoJitDynamicMethodInfo *ji)
 {
-       char *name;
-       MonoMethod *wrapper;
-       gconstpointer trampoline;
-       MonoDomain *domain = mono_get_root_domain ();
-       
-       if (callinfo->wrapper) {
-               return callinfo->wrapper;
-       }
+       if (!domain_jit_info (domain)->dynamic_code_hash)
+               domain_jit_info (domain)->dynamic_code_hash = g_hash_table_new (NULL, NULL);
+       g_hash_table_insert (domain_jit_info (domain)->dynamic_code_hash, method, ji);
+}
 
-       if (callinfo->trampoline)
-               return callinfo->trampoline;
-
-       /* 
-        * We use the lock on the root domain instead of the JIT lock to protect 
-        * callinfo->trampoline, since we do a lot of stuff inside the critical section.
-        */
-       mono_loader_lock (); /*FIXME mono_compile_method requires the loader lock, by large.*/
-       mono_domain_lock (domain);
-
-       if (callinfo->trampoline) {
-               mono_domain_unlock (domain);
-               mono_loader_unlock ();
-               return callinfo->trampoline;
-       }
-
-       name = g_strdup_printf ("__icall_wrapper_%s", callinfo->name);
-       wrapper = mono_marshal_get_icall_wrapper (callinfo->sig, name, callinfo->func, check_for_pending_exc);
-       g_free (name);
-
-       if (do_compile)
-               trampoline = mono_compile_method (wrapper);
-       else
-               trampoline = mono_create_ftnptr (domain, mono_create_jit_trampoline_in_domain (domain, wrapper));
-       mono_register_jit_icall_wrapper (callinfo, trampoline);
-
-       callinfo->trampoline = trampoline;
-
-       mono_domain_unlock (domain);
-       mono_loader_unlock ();
-       
-       return callinfo->trampoline;
-}
-
-gconstpointer
-mono_icall_get_wrapper (MonoJitICallInfo* callinfo)
-{
-       return mono_icall_get_wrapper_full (callinfo, FALSE);
-}
-
-static void
-mono_dynamic_code_hash_insert (MonoDomain *domain, MonoMethod *method, MonoJitDynamicMethodInfo *ji)
-{
-       if (!domain_jit_info (domain)->dynamic_code_hash)
-               domain_jit_info (domain)->dynamic_code_hash = g_hash_table_new (NULL, NULL);
-       g_hash_table_insert (domain_jit_info (domain)->dynamic_code_hash, method, ji);
-}
-
-static MonoJitDynamicMethodInfo*
-mono_dynamic_code_hash_lookup (MonoDomain *domain, MonoMethod *method)
-{
-       MonoJitDynamicMethodInfo *res;
+static MonoJitDynamicMethodInfo*
+mono_dynamic_code_hash_lookup (MonoDomain *domain, MonoMethod *method)
+{
+       MonoJitDynamicMethodInfo *res;
 
        if (domain_jit_info (domain)->dynamic_code_hash)
                res = g_hash_table_lookup (domain_jit_info (domain)->dynamic_code_hash, method);
@@ -1898,6 +1325,7 @@ mono_allocate_stack_slots2 (MonoCompile *cfg, gboolean backward, guint32 *stack_
                if (cfg->disable_reuse_stack_slots)
                        reuse_slot = FALSE;
 
+               t = mini_get_underlying_type (cfg, t);
                switch (t->type) {
                case MONO_TYPE_GENERICINST:
                        if (!mono_type_generic_inst_is_valuetype (t)) {
@@ -2196,66 +1624,63 @@ mono_allocate_stack_slots (MonoCompile *cfg, gboolean backward, guint32 *stack_s
                if (cfg->disable_reuse_stack_slots)
                        reuse_slot = FALSE;
 
-               if (t->byref) {
-                       slot_info = &scalar_stack_slots [MONO_TYPE_I];
-               } else {
-                       switch (t->type) {
-                       case MONO_TYPE_GENERICINST:
-                               if (!mono_type_generic_inst_is_valuetype (t)) {
-                                       slot_info = &scalar_stack_slots [t->type];
-                                       break;
-                               }
-                               /* Fall through */
-                       case MONO_TYPE_VALUETYPE:
-                               if (!vtype_stack_slots)
-                                       vtype_stack_slots = mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * 256);
-                               for (i = 0; i < nvtypes; ++i)
-                                       if (t->data.klass == vtype_stack_slots [i].vtype)
-                                               break;
-                               if (i < nvtypes)
-                                       slot_info = &vtype_stack_slots [i];
-                               else {
-                                       g_assert (nvtypes < 256);
-                                       vtype_stack_slots [nvtypes].vtype = t->data.klass;
-                                       slot_info = &vtype_stack_slots [nvtypes];
-                                       nvtypes ++;
-                               }
-                               if (cfg->disable_reuse_ref_stack_slots)
-                                       reuse_slot = FALSE;
+               t = mini_get_underlying_type (cfg, t);
+               switch (t->type) {
+               case MONO_TYPE_GENERICINST:
+                       if (!mono_type_generic_inst_is_valuetype (t)) {
+                               slot_info = &scalar_stack_slots [t->type];
                                break;
+                       }
+                       /* Fall through */
+               case MONO_TYPE_VALUETYPE:
+                       if (!vtype_stack_slots)
+                               vtype_stack_slots = mono_mempool_alloc0 (cfg->mempool, sizeof (StackSlotInfo) * 256);
+                       for (i = 0; i < nvtypes; ++i)
+                               if (t->data.klass == vtype_stack_slots [i].vtype)
+                                       break;
+                       if (i < nvtypes)
+                               slot_info = &vtype_stack_slots [i];
+                       else {
+                               g_assert (nvtypes < 256);
+                               vtype_stack_slots [nvtypes].vtype = t->data.klass;
+                               slot_info = &vtype_stack_slots [nvtypes];
+                               nvtypes ++;
+                       }
+                       if (cfg->disable_reuse_ref_stack_slots)
+                               reuse_slot = FALSE;
+                       break;
 
-                       case MONO_TYPE_PTR:
-                       case MONO_TYPE_I:
-                       case MONO_TYPE_U:
+               case MONO_TYPE_PTR:
+               case MONO_TYPE_I:
+               case MONO_TYPE_U:
 #if SIZEOF_VOID_P == 4
-                       case MONO_TYPE_I4:
+               case MONO_TYPE_I4:
 #else
-                       case MONO_TYPE_I8:
+               case MONO_TYPE_I8:
 #endif
-                               if (cfg->disable_ref_noref_stack_slot_share) {
-                                       slot_info = &scalar_stack_slots [MONO_TYPE_I];
-                                       break;
-                               }
-                               /* Fall through */
-
-                       case MONO_TYPE_CLASS:
-                       case MONO_TYPE_OBJECT:
-                       case MONO_TYPE_ARRAY:
-                       case MONO_TYPE_SZARRAY:
-                       case MONO_TYPE_STRING:
-                               /* Share non-float stack slots of the same size */
-                               slot_info = &scalar_stack_slots [MONO_TYPE_CLASS];
-                               if (cfg->disable_reuse_ref_stack_slots)
-                                       reuse_slot = FALSE;
-                               break;
-                       case MONO_TYPE_VAR:
-                       case MONO_TYPE_MVAR:
-                               slot_info = &scalar_stack_slots [t->type];
-                               break;
-                       default:
-                               slot_info = &scalar_stack_slots [t->type];
+                       if (cfg->disable_ref_noref_stack_slot_share) {
+                               slot_info = &scalar_stack_slots [MONO_TYPE_I];
                                break;
                        }
+                       /* Fall through */
+
+               case MONO_TYPE_CLASS:
+               case MONO_TYPE_OBJECT:
+               case MONO_TYPE_ARRAY:
+               case MONO_TYPE_SZARRAY:
+               case MONO_TYPE_STRING:
+                       /* Share non-float stack slots of the same size */
+                       slot_info = &scalar_stack_slots [MONO_TYPE_CLASS];
+                       if (cfg->disable_reuse_ref_stack_slots)
+                               reuse_slot = FALSE;
+                       break;
+               case MONO_TYPE_VAR:
+               case MONO_TYPE_MVAR:
+                       slot_info = &scalar_stack_slots [t->type];
+                       break;
+               default:
+                       slot_info = &scalar_stack_slots [t->type];
+                       break;
                }
 
                slot = 0xffffff;
@@ -2406,8 +1831,8 @@ mono_find_jit_opcode_emulation (int opcode)
        return NULL;
 }
 
-static void
-register_opcode_emulation (int opcode, const char *name, const char *sigstr, gpointer func, const char *symbol, gboolean no_throw)
+void
+mini_register_opcode_emulation (int opcode, const char *name, const char *sigstr, gpointer func, const char *symbol, gboolean no_throw)
 {
        MonoJitICallInfo *info;
        MonoMethodSignature *sig = mono_create_icall_signature (sigstr);
@@ -2415,7 +1840,8 @@ register_opcode_emulation (int opcode, const char *name, const char *sigstr, gpo
        g_assert (!sig->hasthis);
        g_assert (sig->param_count < 3);
 
-       info = mono_register_jit_icall_full (func, name, sig, no_throw, symbol);
+       /* Opcode emulation functions are assumed to don't call mono_raise_exception () */
+       info = mono_register_jit_icall_full (func, name, sig, no_throw, TRUE, symbol);
 
        if (emul_opcode_num >= emul_opcode_alloced) {
                int incr = emul_opcode_alloced? emul_opcode_alloced/2: 16;
@@ -2429,38 +1855,6 @@ register_opcode_emulation (int opcode, const char *name, const char *sigstr, gpo
        emul_opcode_hit_cache [opcode >> (EMUL_HIT_SHIFT + 3)] |= (1 << (opcode & EMUL_HIT_MASK));
 }
 
-/*
- * For JIT icalls implemented in C.
- * NAME should be the same as the name of the C function whose address is FUNC.
- * If SAVE is TRUE, no wrapper is generated. This is for perf critical icalls which
- * can't throw exceptions.
- */
-static void
-register_icall (gpointer func, const char *name, const char *sigstr, gboolean save)
-{
-       MonoMethodSignature *sig;
-
-       if (sigstr)
-               sig = mono_create_icall_signature (sigstr);
-       else
-               sig = NULL;
-
-       mono_register_jit_icall_full (func, name, sig, save, save ? name : NULL);
-}
-
-static void
-register_dyn_icall (gpointer func, const char *name, const char *sigstr, gboolean save)
-{
-       MonoMethodSignature *sig;
-
-       if (sigstr)
-               sig = mono_create_icall_signature (sigstr);
-       else
-               sig = NULL;
-
-       mono_register_jit_icall (func, name, sig, save);
-}
-
 static void
 print_dfn (MonoCompile *cfg) {
        int i, j;
@@ -2643,5261 +2037,2289 @@ mono_destroy_compile (MonoCompile *cfg)
        g_free (cfg);
 }
 
-#ifdef MONO_HAVE_FAST_TLS
-MONO_FAST_TLS_DECLARE(mono_lmf_addr);
-#ifdef MONO_ARCH_ENABLE_MONO_LMF_VAR
-/* 
- * When this is defined, the current lmf is stored in this tls variable instead of in 
- * jit_tls->lmf.
- */
-MONO_FAST_TLS_DECLARE(mono_lmf);
-#endif
-#endif
+#ifndef DISABLE_JIT
 
-gint32
-mono_get_jit_tls_offset (void)
+static MonoInst*
+mono_create_tls_get_offset (MonoCompile *cfg, int offset)
 {
-       int offset;
+       MonoInst* ins;
 
-#ifdef HOST_WIN32
-       if (mono_jit_tls_id)
-               offset = mono_jit_tls_id;
-       else
-               /* FIXME: Happens during startup */
-               offset = -1;
-#else
-       MONO_THREAD_VAR_OFFSET (mono_jit_tls, offset);
-#endif
-       return offset;
-}
+       if (!MONO_ARCH_HAVE_TLS_GET)
+               return NULL;
 
-gint32
-mono_get_lmf_tls_offset (void)
-{
-#if defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
-       int offset;
-       MONO_THREAD_VAR_OFFSET(mono_lmf,offset);
-       return offset;
-#else
-       return -1;
-#endif
-}
+       if (offset == -1)
+               return NULL;
 
-gint32
-mono_get_lmf_addr_tls_offset (void)
-{
-       int offset;
-       MONO_THREAD_VAR_OFFSET(mono_lmf_addr,offset);
-       return offset;
+       MONO_INST_NEW (cfg, ins, OP_TLS_GET);
+       ins->dreg = mono_alloc_preg (cfg);
+       ins->inst_offset = offset;
+       return ins;
 }
 
-MonoLMF *
-mono_get_lmf (void)
+gboolean
+mini_tls_get_supported (MonoCompile *cfg, MonoTlsKey key)
 {
-#if defined(MONO_HAVE_FAST_TLS) && defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
-       return MONO_FAST_TLS_GET (mono_lmf);
-#else
-       MonoJitTlsData *jit_tls;
+       if (!MONO_ARCH_HAVE_TLS_GET)
+               return FALSE;
 
-       if ((jit_tls = mono_native_tls_get_value (mono_jit_tls_id)))
-               return jit_tls->lmf;
-       /*
-        * We do not assert here because this function can be called from
-        * mini-gc.c on a thread that has not executed any managed code, yet
-        * (the thread object allocation can trigger a collection).
-        */
-       return NULL;
-#endif
+       if (cfg->compile_aot)
+               return ARCH_HAVE_TLS_GET_REG;
+       else
+               return mini_get_tls_offset (key) != -1;
 }
 
-MonoLMF **
-mono_get_lmf_addr (void)
+MonoInst*
+mono_create_tls_get (MonoCompile *cfg, MonoTlsKey key)
 {
-#ifdef MONO_HAVE_FAST_TLS
-       return MONO_FAST_TLS_GET (mono_lmf_addr);
-#else
-       MonoJitTlsData *jit_tls;
-
-       jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
-       if (G_LIKELY (jit_tls))
-               return &jit_tls->lmf;
-
        /*
-        * When resolving the call to mono_jit_thread_attach full-aot will look
-        * in the plt, which causes a call into the generic trampoline, which in turn
-        * tries to resolve the lmf_addr creating a cyclic dependency.  We cannot
-        * call mono_jit_thread_attach from the native-to-managed wrapper, without
-        * mono_get_lmf_addr, and mono_get_lmf_addr requires the thread to be attached.
+        * TLS offsets might be different at AOT time, so load them from a GOT slot and
+        * use a different opcode.
         */
+       if (cfg->compile_aot) {
+               if (MONO_ARCH_HAVE_TLS_GET && ARCH_HAVE_TLS_GET_REG) {
+                       MonoInst *ins, *c;
 
-       mono_jit_thread_attach (NULL);
-       
-       if ((jit_tls = mono_native_tls_get_value (mono_jit_tls_id)))
-               return &jit_tls->lmf;
+                       EMIT_NEW_TLS_OFFSETCONST (cfg, c, key);
+                       MONO_INST_NEW (cfg, ins, OP_TLS_GET_REG);
+                       ins->dreg = mono_alloc_preg (cfg);
+                       ins->sreg1 = c->dreg;
+                       return ins;
+               } else {
+                       return NULL;
+               }
+       }
 
-       g_assert_not_reached ();
-       return NULL;
-#endif
+       return mono_create_tls_get_offset (cfg, mini_get_tls_offset (key));
 }
 
-void
-mono_set_lmf (MonoLMF *lmf)
+MonoInst*
+mono_get_jit_tls_intrinsic (MonoCompile *cfg)
 {
-#if defined(MONO_HAVE_FAST_TLS) && defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
-       MONO_FAST_TLS_SET (mono_lmf, lmf);
-#endif
+       return mono_create_tls_get (cfg, TLS_KEY_JIT_TLS);
+}
 
-       (*mono_get_lmf_addr ()) = lmf;
+MonoInst*
+mono_get_domain_intrinsic (MonoCompile* cfg)
+{
+       return mono_create_tls_get (cfg, TLS_KEY_DOMAIN);
 }
 
-MonoJitTlsData*
-mono_get_jit_tls (void)
+MonoInst*
+mono_get_thread_intrinsic (MonoCompile* cfg)
 {
-       return mono_native_tls_get_value (mono_jit_tls_id);
+       return mono_create_tls_get (cfg, TLS_KEY_THREAD);
 }
 
-static void
-mono_set_jit_tls (MonoJitTlsData *jit_tls)
+MonoInst*
+mono_get_lmf_intrinsic (MonoCompile* cfg)
 {
-       MonoThreadInfo *info;
+       return mono_create_tls_get (cfg, TLS_KEY_LMF);
+}
 
-       mono_native_tls_set_value (mono_jit_tls_id, jit_tls);
+MonoInst*
+mono_get_lmf_addr_intrinsic (MonoCompile* cfg)
+{
+       return mono_create_tls_get (cfg, TLS_KEY_LMF_ADDR);
+}
 
-#ifdef MONO_HAVE_FAST_TLS
-       MONO_FAST_TLS_SET (mono_jit_tls, jit_tls);
-#endif
+#endif /* !DISABLE_JIT */
 
-       /* Save it into MonoThreadInfo so it can be accessed by mono_thread_state_init_from_handle () */
-       info = mono_thread_info_current ();
-       if (info)
-               mono_thread_info_tls_set (info, TLS_KEY_JIT_TLS, jit_tls);
-}
 
-static void
-mono_set_lmf_addr (gpointer lmf_addr)
+void
+mono_add_patch_info (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpointer target)
 {
-       MonoThreadInfo *info;
+       MonoJumpInfo *ji = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
 
-#ifdef MONO_HAVE_FAST_TLS
-       MONO_FAST_TLS_SET (mono_lmf_addr, lmf_addr);
-#endif
+       ji->ip.i = ip;
+       ji->type = type;
+       ji->data.target = target;
+       ji->next = cfg->patch_info;
 
-       /* Save it into MonoThreadInfo so it can be accessed by mono_thread_state_init_from_handle () */
-       info = mono_thread_info_current ();
-       if (info)
-               mono_thread_info_tls_set (info, TLS_KEY_LMF_ADDR, lmf_addr);
+       cfg->patch_info = ji;
 }
 
-/*
- * mono_jit_thread_attach:
- *
- * Called by native->managed wrappers. Returns the original domain which needs to be
- * restored, or NULL.
- */
-MonoDomain*
-mono_jit_thread_attach (MonoDomain *domain)
+void
+mono_add_patch_info_rel (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpointer target, int relocation)
 {
-       MonoDomain *orig;
-
-       if (!domain)
-               /* 
-                * Happens when called from AOTed code which is only used in the root
-                * domain.
-                */
-               domain = mono_get_root_domain ();
+       MonoJumpInfo *ji = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
 
-#ifdef MONO_HAVE_FAST_TLS
-       if (!MONO_FAST_TLS_GET (mono_lmf_addr)) {
-               mono_thread_attach (domain);
-               // #678164
-               mono_thread_set_state (mono_thread_internal_current (), ThreadState_Background);
-       }
-#else
-       if (!mono_native_tls_get_value (mono_jit_tls_id)) {
-               mono_thread_attach (domain);
-               mono_thread_set_state (mono_thread_internal_current (), ThreadState_Background);
-       }
-#endif
-       orig = mono_domain_get ();
-       if (orig != domain)
-               mono_domain_set (domain, TRUE);
+       ji->ip.i = ip;
+       ji->type = type;
+       ji->relocation = relocation;
+       ji->data.target = target;
+       ji->next = cfg->patch_info;
 
-       return orig != domain ? orig : NULL;
-}      
+       cfg->patch_info = ji;
+}
 
-/* Called by native->managed wrappers */
 void
-mono_jit_set_domain (MonoDomain *domain)
+mono_remove_patch_info (MonoCompile *cfg, int ip)
 {
-       if (domain)
-               mono_domain_set (domain, TRUE);
+       MonoJumpInfo **ji = &cfg->patch_info;
+
+       while (*ji) {
+               if ((*ji)->ip.i == ip)
+                       *ji = (*ji)->next;
+               else
+                       ji = &((*ji)->next);
+       }
 }
 
-/**
- * mono_thread_abort:
- * @obj: exception object
- *
- * abort the thread, print exception information and stack trace
- */
-static void
-mono_thread_abort (MonoObject *obj)
+void
+mono_add_seq_point (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, int native_offset)
 {
-       /* MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id); */
-       
-       /* handle_remove should be eventually called for this thread, too
-       g_free (jit_tls);*/
-
-       if ((mono_runtime_unhandled_exception_policy_get () == MONO_UNHANDLED_POLICY_LEGACY) ||
-                       (obj->vtable->klass == mono_defaults.threadabortexception_class)) {
-               mono_thread_exit ();
-       } else {
-               mono_invoke_unhandled_exception_hook (obj);
+       ins->inst_offset = native_offset;
+       g_ptr_array_add (cfg->seq_points, ins);
+       if (bb) {
+               bb->seq_points = g_slist_prepend_mempool (cfg->mempool, bb->seq_points, ins);
+               bb->last_seq_point = ins;
        }
 }
 
-static void*
-setup_jit_tls_data (gpointer stack_start, gpointer abort_func)
+void
+mono_add_var_location (MonoCompile *cfg, MonoInst *var, gboolean is_reg, int reg, int offset, int from, int to)
 {
-       MonoJitTlsData *jit_tls;
-       MonoLMF *lmf;
-
-       jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
-       if (jit_tls)
-               return jit_tls;
-
-       jit_tls = g_new0 (MonoJitTlsData, 1);
-
-       jit_tls->abort_func = abort_func;
-       jit_tls->end_of_stack = stack_start;
+       MonoDwarfLocListEntry *entry = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoDwarfLocListEntry));
 
-       mono_set_jit_tls (jit_tls);
+       if (is_reg)
+               g_assert (offset == 0);
 
-       lmf = g_new0 (MonoLMF, 1);
-       MONO_ARCH_INIT_TOP_LMF_ENTRY (lmf);
-
-       jit_tls->first_lmf = lmf;
-
-#if defined(MONO_HAVE_FAST_TLS) && defined(MONO_ARCH_ENABLE_MONO_LMF_VAR)
-       /* jit_tls->lmf is unused */
-       MONO_FAST_TLS_SET (mono_lmf, lmf);
-       mono_set_lmf_addr (MONO_FAST_TLS_ADDR (mono_lmf));
-#else
-       mono_set_lmf_addr (&jit_tls->lmf);
-
-       jit_tls->lmf = lmf;
-#endif
-
-#ifdef MONO_ARCH_HAVE_TLS_INIT
-       mono_arch_tls_init ();
-#endif
-
-       mono_setup_altstack (jit_tls);
+       entry->is_reg = is_reg;
+       entry->reg = reg;
+       entry->offset = offset;
+       entry->from = from;
+       entry->to = to;
 
-       return jit_tls;
+       if (var == cfg->args [0])
+               cfg->this_loclist = g_slist_append_mempool (cfg->mempool, cfg->this_loclist, entry);
+       else if (var == cfg->rgctx_var)
+               cfg->rgctx_loclist = g_slist_append_mempool (cfg->mempool, cfg->rgctx_loclist, entry);
 }
 
-static void
-free_jit_tls_data (MonoJitTlsData *jit_tls)
-{
-       mono_arch_free_jit_tls_data (jit_tls);
-       mono_free_altstack (jit_tls);
-
-       g_free (jit_tls->first_lmf);
-       g_free (jit_tls);
-}
+#ifndef DISABLE_JIT
 
 static void
-mono_thread_start_cb (intptr_t tid, gpointer stack_start, gpointer func)
+mono_compile_create_vars (MonoCompile *cfg)
 {
-       MonoInternalThread *thread;
-       void *jit_tls = setup_jit_tls_data (stack_start, mono_thread_abort);
-       thread = mono_thread_internal_current ();
-       if (thread)
-               thread->jit_data = jit_tls;
+       MonoMethodSignature *sig;
+       MonoMethodHeader *header;
+       int i;
 
-       mono_arch_cpu_init ();
-}
+       header = cfg->header;
 
-void (*mono_thread_attach_aborted_cb ) (MonoObject *obj) = NULL;
+       sig = mono_method_signature (cfg->method);
+       
+       if (!MONO_TYPE_IS_VOID (sig->ret)) {
+               cfg->ret = mono_compile_create_var (cfg, sig->ret, OP_ARG);
+               /* Inhibit optimizations */
+               cfg->ret->flags |= MONO_INST_VOLATILE;
+       }
+       if (cfg->verbose_level > 2)
+               g_print ("creating vars\n");
 
-static void
-mono_thread_abort_dummy (MonoObject *obj)
-{
-  if (mono_thread_attach_aborted_cb)
-    mono_thread_attach_aborted_cb (obj);
-  else
-    mono_thread_abort (obj);
-}
+       cfg->args = mono_mempool_alloc0 (cfg->mempool, (sig->param_count + sig->hasthis) * sizeof (MonoInst*));
 
-static void
-mono_thread_attach_cb (intptr_t tid, gpointer stack_start)
-{
-       MonoInternalThread *thread;
-       void *jit_tls = setup_jit_tls_data (stack_start, mono_thread_abort_dummy);
-       thread = mono_thread_internal_current ();
-       if (thread)
-               thread->jit_data = jit_tls;
-       if (mono_profiler_get_events () & MONO_PROFILE_STATISTICAL)
-               mono_runtime_setup_stat_profiler ();
-
-       mono_arch_cpu_init ();
-}
+       if (sig->hasthis)
+               cfg->args [0] = mono_compile_create_var (cfg, &cfg->method->klass->this_arg, OP_ARG);
 
-static void
-mini_thread_cleanup (MonoInternalThread *thread)
-{
-       MonoJitTlsData *jit_tls = thread->jit_data;
-
-       if (jit_tls) {
-               /* We can't clean up tls information if we are on another thread, it will clean up the wrong stuff
-                * It would be nice to issue a warning when this happens outside of the shutdown sequence. but it's
-                * not a trivial thing.
-                *
-                * The current offender is mono_thread_manage which cleanup threads from the outside.
-                */
-               if (thread == mono_thread_internal_current ())
-                       mono_set_jit_tls (NULL);
+       for (i = 0; i < sig->param_count; ++i) {
+               cfg->args [i + sig->hasthis] = mono_compile_create_var (cfg, sig->params [i], OP_ARG);
+       }
 
-               /* If we attach a thread but never call into managed land, we might never get an lmf.*/
-               if (mono_get_lmf ()) {
-                       mono_set_lmf (NULL);
-                       mono_set_lmf_addr (NULL);
+       if (cfg->verbose_level > 2) {
+               if (cfg->ret) {
+                       printf ("\treturn : ");
+                       mono_print_ins (cfg->ret);
                }
 
-               free_jit_tls_data (jit_tls);
-
-               thread->jit_data = NULL;
-       }
-}
-
-int
-mini_get_tls_offset (MonoTlsKey key)
-{
-       int offset;
+               if (sig->hasthis) {
+                       printf ("\tthis: ");
+                       mono_print_ins (cfg->args [0]);
+               }
 
-       switch (key) {
-       case TLS_KEY_THREAD:
-               offset = mono_thread_get_tls_offset ();
-               break;
-       case TLS_KEY_JIT_TLS:
-               offset = mono_get_jit_tls_offset ();
-               break;
-       case TLS_KEY_DOMAIN:
-               offset = mono_domain_get_tls_offset ();
-               break;
-       case TLS_KEY_LMF:
-               offset = mono_get_lmf_tls_offset ();
-               break;
-       case TLS_KEY_LMF_ADDR:
-               offset = mono_get_lmf_addr_tls_offset ();
-               break;
-       default:
-               offset = mono_tls_key_get_offset (key);
-               g_assert (offset != -1);
-               break;
+               for (i = 0; i < sig->param_count; ++i) {
+                       printf ("\targ [%d]: ", i);
+                       mono_print_ins (cfg->args [i + sig->hasthis]);
+               }
        }
 
-       return offset;
-}
+       cfg->locals_start = cfg->num_varinfo;
+       cfg->locals = mono_mempool_alloc0 (cfg->mempool, header->num_locals * sizeof (MonoInst*));
 
-#ifndef DISABLE_JIT
+       if (cfg->verbose_level > 2)
+               g_print ("creating locals\n");
 
-static MonoInst*
-mono_create_tls_get_offset (MonoCompile *cfg, int offset)
-{
-       MonoInst* ins;
+       for (i = 0; i < header->num_locals; ++i)
+               cfg->locals [i] = mono_compile_create_var (cfg, header->locals [i], OP_LOCAL);
 
-       if (!MONO_ARCH_HAVE_TLS_GET)
-               return NULL;
+       if (cfg->verbose_level > 2)
+               g_print ("locals done\n");
 
-       if (offset == -1)
-               return NULL;
+       mono_arch_create_vars (cfg);
 
-       MONO_INST_NEW (cfg, ins, OP_TLS_GET);
-       ins->dreg = mono_alloc_preg (cfg);
-       ins->inst_offset = offset;
-       return ins;
+       if (cfg->method->save_lmf && cfg->create_lmf_var) {
+               MonoInst *lmf_var = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_LOCAL);
+               lmf_var->flags |= MONO_INST_VOLATILE;
+               lmf_var->flags |= MONO_INST_LMF;
+               cfg->lmf_var = lmf_var;
+       }
 }
 
-gboolean
-mini_tls_get_supported (MonoCompile *cfg, MonoTlsKey key)
+void
+mono_print_code (MonoCompile *cfg, const char* msg)
 {
-       if (!MONO_ARCH_HAVE_TLS_GET)
-               return FALSE;
-
-       if (cfg->compile_aot)
-               return ARCH_HAVE_TLS_GET_REG;
-       else
-               return mini_get_tls_offset (key) != -1;
+       MonoBasicBlock *bb;
+       
+       for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
+               mono_print_bb (bb, msg);
 }
 
-MonoInst*
-mono_create_tls_get (MonoCompile *cfg, MonoTlsKey key)
+static void
+mono_postprocess_patches (MonoCompile *cfg)
 {
-       /*
-        * TLS offsets might be different at AOT time, so load them from a GOT slot and
-        * use a different opcode.
-        */
-       if (cfg->compile_aot) {
-               if (MONO_ARCH_HAVE_TLS_GET && ARCH_HAVE_TLS_GET_REG) {
-                       MonoInst *ins, *c;
+       MonoJumpInfo *patch_info;
+       int i;
 
-                       EMIT_NEW_TLS_OFFSETCONST (cfg, c, key);
-                       MONO_INST_NEW (cfg, ins, OP_TLS_GET_REG);
-                       ins->dreg = mono_alloc_preg (cfg);
-                       ins->sreg1 = c->dreg;
-                       return ins;
-               } else {
-                       return NULL;
-               }
-       }
+       for (patch_info = cfg->patch_info; patch_info; patch_info = patch_info->next) {
+               switch (patch_info->type) {
+               case MONO_PATCH_INFO_ABS: {
+                       MonoJitICallInfo *info = mono_find_jit_icall_by_addr (patch_info->data.target);
 
-       return mono_create_tls_get_offset (cfg, mini_get_tls_offset (key));
-}
+                       /*
+                        * Change patches of type MONO_PATCH_INFO_ABS into patches describing the 
+                        * absolute address.
+                        */
+                       if (info) {
+                               //printf ("TEST %s %p\n", info->name, patch_info->data.target);
+                               /* for these array methods we currently register the same function pointer
+                                * since it's a vararg function. But this means that mono_find_jit_icall_by_addr ()
+                                * will return the incorrect one depending on the order they are registered.
+                                * See tests/test-arr.cs
+                                */
+                               if (strstr (info->name, "ves_array_new_va_") == NULL && strstr (info->name, "ves_array_element_address_") == NULL) {
+                                       patch_info->type = MONO_PATCH_INFO_INTERNAL_METHOD;
+                                       patch_info->data.name = info->name;
+                               }
+                       }
 
-MonoInst*
-mono_get_jit_tls_intrinsic (MonoCompile *cfg)
-{
-       return mono_create_tls_get (cfg, TLS_KEY_JIT_TLS);
-}
+                       if (patch_info->type == MONO_PATCH_INFO_ABS) {
+                               if (cfg->abs_patches) {
+                                       MonoJumpInfo *abs_ji = g_hash_table_lookup (cfg->abs_patches, patch_info->data.target);
+                                       if (abs_ji) {
+                                               patch_info->type = abs_ji->type;
+                                               patch_info->data.target = abs_ji->data.target;
+                                       }
+                               }
+                       }
 
-MonoInst*
-mono_get_domain_intrinsic (MonoCompile* cfg)
-{
-       return mono_create_tls_get (cfg, TLS_KEY_DOMAIN);
-}
+                       break;
+               }
+               case MONO_PATCH_INFO_SWITCH: {
+                       gpointer *table;
+#if defined(__native_client__) && defined(__native_client_codegen__)
+                       /* This memory will leak.  */
+                       /* TODO: can we free this when  */
+                       /* making the final jump table? */
+                       table = g_malloc0 (sizeof(gpointer) * patch_info->data.table->table_size);
+#else
+                       if (cfg->method->dynamic) {
+                               table = mono_code_manager_reserve (cfg->dynamic_info->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
+                       } else {
+                               table = mono_domain_code_reserve (cfg->domain, sizeof (gpointer) * patch_info->data.table->table_size);
+                       }
+#endif
 
-MonoInst*
-mono_get_thread_intrinsic (MonoCompile* cfg)
-{
-       return mono_create_tls_get (cfg, TLS_KEY_THREAD);
-}
+                       for (i = 0; i < patch_info->data.table->table_size; i++) {
+                               /* Might be NULL if the switch is eliminated */
+                               if (patch_info->data.table->table [i]) {
+                                       g_assert (patch_info->data.table->table [i]->native_offset);
+                                       table [i] = GINT_TO_POINTER (patch_info->data.table->table [i]->native_offset);
+                               } else {
+                                       table [i] = NULL;
+                               }
+                       }
+                       patch_info->data.table->table = (MonoBasicBlock**)table;
+                       break;
+               }
+               case MONO_PATCH_INFO_METHOD_JUMP: {
+                       MonoJumpList *jlist;
+                       MonoDomain *domain = cfg->domain;
+                       unsigned char *ip = cfg->native_code + patch_info->ip.i;
+#if defined(__native_client__) && defined(__native_client_codegen__)
+                       /* When this jump target gets evaluated, the method */
+                       /* will be installed in the dynamic code section,   */
+                       /* not at the location of cfg->native_code.         */
+                       ip = nacl_inverse_modify_patch_target (cfg->native_code) + patch_info->ip.i;
+#endif
 
-MonoInst*
-mono_get_lmf_intrinsic (MonoCompile* cfg)
-{
-       return mono_create_tls_get (cfg, TLS_KEY_LMF);
+                       mono_domain_lock (domain);
+                       jlist = g_hash_table_lookup (domain_jit_info (domain)->jump_target_hash, patch_info->data.method);
+                       if (!jlist) {
+                               jlist = mono_domain_alloc0 (domain, sizeof (MonoJumpList));
+                               g_hash_table_insert (domain_jit_info (domain)->jump_target_hash, patch_info->data.method, jlist);
+                       }
+                       jlist->list = g_slist_prepend (jlist->list, ip);
+                       mono_domain_unlock (domain);
+                       break;
+               }
+               default:
+                       /* do nothing */
+                       break;
+               }
+       }
 }
 
-MonoInst*
-mono_get_lmf_addr_intrinsic (MonoCompile* cfg)
+void
+mono_codegen (MonoCompile *cfg)
 {
-       return mono_create_tls_get (cfg, TLS_KEY_LMF_ADDR);
-}
+       MonoBasicBlock *bb;
+       int max_epilog_size;
+       guint8 *code;
+       MonoDomain *code_domain;
 
-#endif /* !DISABLE_JIT */
-
-
-static gboolean
-mini_tls_key_supported (MonoTlsKey key)
-{
-       if (!MONO_ARCH_HAVE_TLS_GET)
-               return FALSE;
-
-       return mini_get_tls_offset (key) != -1;
-}
+       if (mono_using_xdebug)
+               /*
+                * Recent gdb versions have trouble processing symbol files containing
+                * overlapping address ranges, so allocate all code from the code manager
+                * of the root domain. (#666152).
+                */
+               code_domain = mono_get_root_domain ();
+       else
+               code_domain = cfg->domain;
 
-void
-mono_add_patch_info (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpointer target)
-{
-       MonoJumpInfo *ji = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
+#if defined(__native_client_codegen__) && defined(__native_client__)
+       void *code_dest;
 
-       ji->ip.i = ip;
-       ji->type = type;
-       ji->data.target = target;
-       ji->next = cfg->patch_info;
+       /* This keeps patch targets from being transformed during
+        * ordinary method compilation, for local branches and jumps.
+        */
+       nacl_allow_target_modification (FALSE);
+#endif
 
-       cfg->patch_info = ji;
-}
+       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+               cfg->spill_count = 0;
+               /* we reuse dfn here */
+               /* bb->dfn = bb_count++; */
 
-void
-mono_add_patch_info_rel (MonoCompile *cfg, int ip, MonoJumpInfoType type, gconstpointer target, int relocation)
-{
-       MonoJumpInfo *ji = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoJumpInfo));
+               mono_arch_lowering_pass (cfg, bb);
 
-       ji->ip.i = ip;
-       ji->type = type;
-       ji->relocation = relocation;
-       ji->data.target = target;
-       ji->next = cfg->patch_info;
+               if (cfg->opt & MONO_OPT_PEEPHOLE)
+                       mono_arch_peephole_pass_1 (cfg, bb);
 
-       cfg->patch_info = ji;
-}
+               if (!cfg->globalra)
+                       mono_local_regalloc (cfg, bb);
 
-MonoJumpInfo *
-mono_patch_info_list_prepend (MonoJumpInfo *list, int ip, MonoJumpInfoType type, gconstpointer target)
-{
-       MonoJumpInfo *ji = g_new0 (MonoJumpInfo, 1);
+               if (cfg->opt & MONO_OPT_PEEPHOLE)
+                       mono_arch_peephole_pass_2 (cfg, bb);
 
-       ji->ip.i = ip;
-       ji->type = type;
-       ji->data.target = target;
-       ji->next = list;
+               if (cfg->gen_seq_points && !cfg->gen_sdb_seq_points)
+                       bb_deduplicate_op_il_seq_points (cfg, bb);
+       }
 
-       return ji;
-}
+       if (cfg->prof_options & MONO_PROFILE_COVERAGE)
+               cfg->coverage_info = mono_profiler_coverage_alloc (cfg->method, cfg->num_bblocks);
 
-void
-mono_remove_patch_info (MonoCompile *cfg, int ip)
-{
-       MonoJumpInfo **ji = &cfg->patch_info;
+       code = mono_arch_emit_prolog (cfg);
 
-       while (*ji) {
-               if ((*ji)->ip.i == ip)
-                       *ji = (*ji)->next;
-               else
-                       ji = &((*ji)->next);
-       }
-}
+       cfg->code_len = code - cfg->native_code;
+       cfg->prolog_end = cfg->code_len;
+       cfg->cfa_reg = cfg->cur_cfa_reg;
+       cfg->cfa_offset = cfg->cur_cfa_offset;
 
-/**
- * mono_patch_info_dup_mp:
- *
- * Make a copy of PATCH_INFO, allocating memory from the mempool MP.
- */
-MonoJumpInfo*
-mono_patch_info_dup_mp (MonoMemPool *mp, MonoJumpInfo *patch_info)
-{
-       MonoJumpInfo *res = mono_mempool_alloc (mp, sizeof (MonoJumpInfo));
-       memcpy (res, patch_info, sizeof (MonoJumpInfo));
-
-       switch (patch_info->type) {
-       case MONO_PATCH_INFO_RVA:
-       case MONO_PATCH_INFO_LDSTR:
-       case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
-       case MONO_PATCH_INFO_LDTOKEN:
-       case MONO_PATCH_INFO_DECLSEC:
-               res->data.token = mono_mempool_alloc (mp, sizeof (MonoJumpInfoToken));
-               memcpy (res->data.token, patch_info->data.token, sizeof (MonoJumpInfoToken));
-               break;
-       case MONO_PATCH_INFO_SWITCH:
-               res->data.table = mono_mempool_alloc (mp, sizeof (MonoJumpInfoBBTable));
-               memcpy (res->data.table, patch_info->data.table, sizeof (MonoJumpInfoBBTable));
-               res->data.table->table = mono_mempool_alloc (mp, sizeof (MonoBasicBlock*) * patch_info->data.table->table_size);
-               memcpy (res->data.table->table, patch_info->data.table->table, sizeof (MonoBasicBlock*) * patch_info->data.table->table_size);
-               break;
-       case MONO_PATCH_INFO_RGCTX_FETCH:
-               res->data.rgctx_entry = mono_mempool_alloc (mp, sizeof (MonoJumpInfoRgctxEntry));
-               memcpy (res->data.rgctx_entry, patch_info->data.rgctx_entry, sizeof (MonoJumpInfoRgctxEntry));
-               res->data.rgctx_entry->data = mono_patch_info_dup_mp (mp, res->data.rgctx_entry->data);
-               break;
-       case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
-               res->data.del_tramp = mono_mempool_alloc0 (mp, sizeof (MonoDelegateClassMethodPair));
-               memcpy (res->data.del_tramp, patch_info->data.del_tramp, sizeof (MonoDelegateClassMethodPair));
-               break;
-       case MONO_PATCH_INFO_GSHAREDVT_CALL:
-               res->data.gsharedvt = mono_mempool_alloc (mp, sizeof (MonoJumpInfoGSharedVtCall));
-               memcpy (res->data.gsharedvt, patch_info->data.gsharedvt, sizeof (MonoJumpInfoGSharedVtCall));
-               break;
-       case MONO_PATCH_INFO_GSHAREDVT_METHOD: {
-               MonoGSharedVtMethodInfo *info;
-               MonoGSharedVtMethodInfo *oinfo;
-               int i;
+       mono_debug_open_method (cfg);
 
-               oinfo = patch_info->data.gsharedvt_method;
-               info = mono_mempool_alloc (mp, sizeof (MonoGSharedVtMethodInfo));
-               res->data.gsharedvt_method = info;
-               memcpy (info, oinfo, sizeof (MonoGSharedVtMethodInfo));
-               info->entries = mono_mempool_alloc (mp, sizeof (MonoRuntimeGenericContextInfoTemplate) * info->count_entries);
-               for (i = 0; i < oinfo->num_entries; ++i) {
-                       MonoRuntimeGenericContextInfoTemplate *otemplate = &oinfo->entries [i];
-                       MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+       /* emit code all basic blocks */
+       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+               bb->native_offset = cfg->code_len;
+               bb->real_native_offset = cfg->code_len;
+               //if ((bb == cfg->bb_entry) || !(bb->region == -1 && !bb->dfn))
+                       mono_arch_output_basic_block (cfg, bb);
+               bb->native_length = cfg->code_len - bb->native_offset;
 
-                       memcpy (template, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
+               if (bb == cfg->bb_exit) {
+                       cfg->epilog_begin = cfg->code_len;
+                       mono_arch_emit_epilog (cfg);
+                       cfg->epilog_end = cfg->code_len;
                }
-               //info->locals_types = mono_mempool_alloc0 (mp, info->nlocals * sizeof (MonoType*));
-               //memcpy (info->locals_types, oinfo->locals_types, info->nlocals * sizeof (MonoType*));
-               break;
-       }
-       default:
-               break;
        }
 
-       return res;
-}
+#ifdef __native_client_codegen__
+       mono_nacl_fix_patches (cfg->native_code, cfg->patch_info);
+#endif
+       mono_arch_emit_exceptions (cfg);
 
-guint
-mono_patch_info_hash (gconstpointer data)
-{
-       const MonoJumpInfo *ji = (MonoJumpInfo*)data;
-
-       switch (ji->type) {
-       case MONO_PATCH_INFO_RVA:
-       case MONO_PATCH_INFO_LDSTR:
-       case MONO_PATCH_INFO_LDTOKEN:
-       case MONO_PATCH_INFO_DECLSEC:
-               return (ji->type << 8) | ji->data.token->token;
-       case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
-               return (ji->type << 8) | ji->data.token->token | (ji->data.token->has_context ? (gsize)ji->data.token->context.class_inst : 0);
-       case MONO_PATCH_INFO_INTERNAL_METHOD:
-               return (ji->type << 8) | g_str_hash (ji->data.name);
-       case MONO_PATCH_INFO_VTABLE:
-       case MONO_PATCH_INFO_CLASS:
-       case MONO_PATCH_INFO_IID:
-       case MONO_PATCH_INFO_ADJUSTED_IID:
-       case MONO_PATCH_INFO_CLASS_INIT:
-       case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
-       case MONO_PATCH_INFO_METHODCONST:
-       case MONO_PATCH_INFO_METHOD:
-       case MONO_PATCH_INFO_METHOD_JUMP:
-       case MONO_PATCH_INFO_IMAGE:
-       case MONO_PATCH_INFO_JIT_ICALL_ADDR:
-       case MONO_PATCH_INFO_ICALL_ADDR:
-       case MONO_PATCH_INFO_FIELD:
-       case MONO_PATCH_INFO_SFLDA:
-       case MONO_PATCH_INFO_SEQ_POINT_INFO:
-       case MONO_PATCH_INFO_METHOD_RGCTX:
-       case MONO_PATCH_INFO_SIGNATURE:
-       case MONO_PATCH_INFO_TLS_OFFSET:
-       case MONO_PATCH_INFO_METHOD_CODE_SLOT:
-               return (ji->type << 8) | (gssize)ji->data.target;
-       case MONO_PATCH_INFO_GSHAREDVT_CALL:
-               return (ji->type << 8) | (gssize)ji->data.gsharedvt->method;
-       case MONO_PATCH_INFO_RGCTX_FETCH: {
-               MonoJumpInfoRgctxEntry *e = ji->data.rgctx_entry;
-
-               return (ji->type << 8) | (gssize)e->method | (e->in_mrgctx) | e->info_type | mono_patch_info_hash (e->data);
-       }
-       case MONO_PATCH_INFO_INTERRUPTION_REQUEST_FLAG:
-       case MONO_PATCH_INFO_MSCORLIB_GOT_ADDR:
-       case MONO_PATCH_INFO_GC_CARD_TABLE_ADDR:
-       case MONO_PATCH_INFO_JIT_TLS_ID:
-       case MONO_PATCH_INFO_MONITOR_ENTER:
-       case MONO_PATCH_INFO_MONITOR_ENTER_V4:
-       case MONO_PATCH_INFO_MONITOR_EXIT:
-       case MONO_PATCH_INFO_GOT_OFFSET:
-               return (ji->type << 8);
-       case MONO_PATCH_INFO_CASTCLASS_CACHE:
-               return (ji->type << 8) | (ji->data.index);
-       case MONO_PATCH_INFO_SWITCH:
-               return (ji->type << 8) | ji->data.table->table_size;
-       case MONO_PATCH_INFO_GSHAREDVT_METHOD:
-               return (ji->type << 8) | (gssize)ji->data.gsharedvt_method->method;
-       case MONO_PATCH_INFO_OBJC_SELECTOR_REF:
-               /* Hash on the selector name */
-               return g_str_hash (ji->data.target);
-       case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
-               return (ji->type << 8) | (gsize)ji->data.del_tramp->klass | (gsize)ji->data.del_tramp->method | (gsize)ji->data.del_tramp->virtual;
-       case MONO_PATCH_INFO_LDSTR_LIT:
-               return g_str_hash (ji->data.target);
-       default:
-               printf ("info type: %d\n", ji->type);
-               mono_print_ji (ji); printf ("\n");
-               g_assert_not_reached ();
-               return 0;
-       }
-}
+       max_epilog_size = 0;
 
-/* 
- * mono_patch_info_equal:
- * 
- * This might fail to recognize equivalent patches, i.e. floats, so its only
- * usable in those cases where this is not a problem, i.e. sharing GOT slots
- * in AOT.
- */
-gint
-mono_patch_info_equal (gconstpointer ka, gconstpointer kb)
-{
-       const MonoJumpInfo *ji1 = (MonoJumpInfo*)ka;
-       const MonoJumpInfo *ji2 = (MonoJumpInfo*)kb;
+       /* we always allocate code in cfg->domain->code_mp to increase locality */
+       cfg->code_size = cfg->code_len + max_epilog_size;
+#ifdef __native_client_codegen__
+       cfg->code_size = NACL_BUNDLE_ALIGN_UP (cfg->code_size);
+#endif
+       /* fixme: align to MONO_ARCH_CODE_ALIGNMENT */
 
-       if (ji1->type != ji2->type)
-               return 0;
+       if (cfg->method->dynamic) {
+               guint unwindlen = 0;
+#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
+               unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
+#endif
+               /* Allocate the code into a separate memory pool so it can be freed */
+               cfg->dynamic_info = g_new0 (MonoJitDynamicMethodInfo, 1);
+               cfg->dynamic_info->code_mp = mono_code_manager_new_dynamic (cfg->thunk_area);
+               mono_domain_lock (cfg->domain);
+               mono_dynamic_code_hash_insert (cfg->domain, cfg->method, cfg->dynamic_info);
+               mono_domain_unlock (cfg->domain);
 
-       switch (ji1->type) {
-       case MONO_PATCH_INFO_RVA:
-       case MONO_PATCH_INFO_LDSTR:
-       case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
-       case MONO_PATCH_INFO_LDTOKEN:
-       case MONO_PATCH_INFO_DECLSEC:
-               if ((ji1->data.token->image != ji2->data.token->image) ||
-                       (ji1->data.token->token != ji2->data.token->token) || 
-                       (ji1->data.token->has_context != ji2->data.token->has_context) ||
-                       (ji1->data.token->context.class_inst != ji2->data.token->context.class_inst) ||
-                       (ji1->data.token->context.method_inst != ji2->data.token->context.method_inst))
-                       return 0;
-               break;
-       case MONO_PATCH_INFO_INTERNAL_METHOD:
-               return g_str_equal (ji1->data.name, ji2->data.name);
-       case MONO_PATCH_INFO_RGCTX_FETCH: {
-               MonoJumpInfoRgctxEntry *e1 = ji1->data.rgctx_entry;
-               MonoJumpInfoRgctxEntry *e2 = ji2->data.rgctx_entry;
-
-               return e1->method == e2->method && e1->in_mrgctx == e2->in_mrgctx && e1->info_type == e2->info_type && mono_patch_info_equal (e1->data, e2->data);
-       }
-       case MONO_PATCH_INFO_GSHAREDVT_CALL: {
-               MonoJumpInfoGSharedVtCall *c1 = ji1->data.gsharedvt;
-               MonoJumpInfoGSharedVtCall *c2 = ji2->data.gsharedvt;
-
-               return c1->sig == c2->sig && c1->method == c2->method;
-       }
-       case MONO_PATCH_INFO_GSHAREDVT_METHOD:
-               return ji1->data.gsharedvt_method->method == ji2->data.gsharedvt_method->method;
-       case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE:
-               return ji1->data.del_tramp->klass == ji2->data.del_tramp->klass && ji1->data.del_tramp->method == ji2->data.del_tramp->method && ji1->data.del_tramp->virtual == ji2->data.del_tramp->virtual;
-       case MONO_PATCH_INFO_CASTCLASS_CACHE:
-               return ji1->data.index == ji2->data.index;
-       default:
-               if (ji1->data.target != ji2->data.target)
-                       return 0;
-               break;
+               if (mono_using_xdebug)
+                       /* See the comment for cfg->code_domain */
+                       code = mono_domain_code_reserve (code_domain, cfg->code_size + unwindlen);
+               else
+                       code = mono_code_manager_reserve (cfg->dynamic_info->code_mp, cfg->code_size + unwindlen);
+       } else {
+               guint unwindlen = 0;
+#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
+               unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
+#endif
+               code = mono_domain_code_reserve (code_domain, cfg->code_size + unwindlen);
        }
+#if defined(__native_client_codegen__) && defined(__native_client__)
+       nacl_allow_target_modification (TRUE);
+#endif
 
-       return 1;
-}
-
-gpointer
-mono_resolve_patch_target (MonoMethod *method, MonoDomain *domain, guint8 *code, MonoJumpInfo *patch_info, gboolean run_cctors)
-{
-       unsigned char *ip = patch_info->ip.i + code;
-       gconstpointer target = NULL;
+       g_assert (code);
+       memcpy (code, cfg->native_code, cfg->code_len);
+#if defined(__default_codegen__)
+       g_free (cfg->native_code);
+#elif defined(__native_client_codegen__)
+       if (cfg->native_code_alloc) {
+               g_free (cfg->native_code_alloc);
+               cfg->native_code_alloc = 0;
+       }
+       else if (cfg->native_code) {
+               g_free (cfg->native_code);
+       }
+#endif /* __native_client_codegen__ */
+       cfg->native_code = code;
+       code = cfg->native_code + cfg->code_len;
+  
+       /* g_assert (((int)cfg->native_code & (MONO_ARCH_CODE_ALIGNMENT - 1)) == 0); */
+       mono_postprocess_patches (cfg);
 
-       switch (patch_info->type) {
-       case MONO_PATCH_INFO_BB:
-               /* 
-                * FIXME: This could be hit for methods without a prolog. Should use -1
-                * but too much code depends on a 0 initial value.
-                */
-               //g_assert (patch_info->data.bb->native_offset);
-               target = patch_info->data.bb->native_offset + code;
-               break;
-       case MONO_PATCH_INFO_ABS:
-               target = patch_info->data.target;
-               break;
-       case MONO_PATCH_INFO_LABEL:
-               target = patch_info->data.inst->inst_c0 + code;
-               break;
-       case MONO_PATCH_INFO_IP:
-#if defined(__native_client__) && defined(__native_client_codegen__)
-               /* Need to transform to the destination address, it's */
-               /* emitted as an immediate in the code. */
-               target = nacl_inverse_modify_patch_target(ip);
-#else
-               target = ip;
+#ifdef VALGRIND_JIT_REGISTER_MAP
+       if (valgrind_register){
+               char* nm = mono_method_full_name (cfg->method, TRUE);
+               VALGRIND_JIT_REGISTER_MAP (nm, cfg->native_code, cfg->native_code + cfg->code_len);
+               g_free (nm);
+       }
 #endif
-               break;
-       case MONO_PATCH_INFO_METHOD_REL:
-               target = code + patch_info->data.offset;
-               break;
-       case MONO_PATCH_INFO_INTERNAL_METHOD: {
-               MonoJitICallInfo *mi = mono_find_jit_icall_by_name (patch_info->data.name);
-               if (!mi) {
-                       g_warning ("unknown MONO_PATCH_INFO_INTERNAL_METHOD %s", patch_info->data.name);
-                       g_assert_not_reached ();
-               }
-               target = mono_icall_get_wrapper (mi);
-               break;
+       if (cfg->verbose_level > 0) {
+               char* nm = mono_method_full_name (cfg->method, TRUE);
+               g_print ("Method %s emitted at %p to %p (code length %d) [%s]\n", 
+                                nm, 
+                                cfg->native_code, cfg->native_code + cfg->code_len, cfg->code_len, cfg->domain->friendly_name);
+               g_free (nm);
        }
-       case MONO_PATCH_INFO_JIT_ICALL_ADDR: {
-               MonoJitICallInfo *mi = mono_find_jit_icall_by_name (patch_info->data.name);
-               if (!mi) {
-                       g_warning ("unknown MONO_PATCH_INFO_JIT_ICALL_ADDR %s", patch_info->data.name);
-                       g_assert_not_reached ();
+
+       {
+               gboolean is_generic = FALSE;
+
+               if (cfg->method->is_inflated || mono_method_get_generic_container (cfg->method) ||
+                               cfg->method->klass->generic_container || cfg->method->klass->generic_class) {
+                       is_generic = TRUE;
                }
-               target = mi->func;
-               break;
+
+               if (cfg->generic_sharing_context)
+                       g_assert (is_generic);
        }
-       case MONO_PATCH_INFO_METHOD_JUMP:
-               target = mono_create_jump_trampoline (domain, patch_info->data.method, FALSE);
-#if defined(__native_client__) && defined(__native_client_codegen__)
-# if defined(TARGET_AMD64)
-               /* This target is an absolute address, not relative to the */
-               /* current code being emitted on AMD64. */
-               target = nacl_inverse_modify_patch_target(target);
-# endif
+
+#ifdef MONO_ARCH_HAVE_SAVE_UNWIND_INFO
+       mono_arch_save_unwind_info (cfg);
 #endif
-               break;
-       case MONO_PATCH_INFO_METHOD:
-#if defined(__native_client_codegen__) && defined(USE_JUMP_TABLES)
-               /*
-                * If we use jumptables, for recursive calls we cannot
-                * avoid trampoline, as we not yet know where we will
-                * be installed.
-                */
-               target = mono_create_jit_trampoline_in_domain (domain, patch_info->data.method);
-#else
-               if (patch_info->data.method == method) {
-                       target = code;
+
+#if defined(__native_client_codegen__) && defined(__native_client__)
+       if (!cfg->compile_aot) {
+               if (cfg->method->dynamic) {
+                       code_dest = nacl_code_manager_get_code_dest(cfg->dynamic_info->code_mp, cfg->native_code);
                } else {
-                       /* get the trampoline to the method from the domain */
-                       target = mono_create_jit_trampoline_in_domain (domain, patch_info->data.method);
-               }
-#endif
-               break;
-       case MONO_PATCH_INFO_METHOD_CODE_SLOT: {
-               gpointer code_slot;
-
-               mono_domain_lock (domain);
-               if (!domain_jit_info (domain)->method_code_hash)
-                       domain_jit_info (domain)->method_code_hash = g_hash_table_new (NULL, NULL);
-               code_slot = g_hash_table_lookup (domain_jit_info (domain)->method_code_hash, patch_info->data.method);
-               if (!code_slot) {
-                       code_slot = mono_domain_alloc0 (domain, sizeof (gpointer));
-                       g_hash_table_insert (domain_jit_info (domain)->method_code_hash, patch_info->data.method, code_slot);
+                       code_dest = nacl_domain_get_code_dest(cfg->domain, cfg->native_code);
                }
-               mono_domain_unlock (domain);
-               target = code_slot;
-               break;
        }
-       case MONO_PATCH_INFO_SWITCH: {
-               gpointer *jump_table;
-               int i;
-#if defined(__native_client__) && defined(__native_client_codegen__)
-               /* This memory will leak, but we don't care if we're */
-               /* not deleting JIT'd methods anyway                 */
-               jump_table = g_malloc0 (sizeof(gpointer) * patch_info->data.table->table_size);
-#else
-               if (method && method->dynamic) {
-                       jump_table = mono_code_manager_reserve (mono_dynamic_code_hash_lookup (domain, method)->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
-               } else {
-                       if (mono_aot_only) {
-                               jump_table = mono_domain_alloc (domain, sizeof (gpointer) * patch_info->data.table->table_size);
-                       } else {
-                               jump_table = mono_domain_code_reserve (domain, sizeof (gpointer) * patch_info->data.table->table_size);
-                       }
-               }
 #endif
 
-               for (i = 0; i < patch_info->data.table->table_size; i++) {
-#if defined(__native_client__) && defined(__native_client_codegen__)
-                       /* 'code' is relative to the current code blob, we */
-                       /* need to do this transform on it to make the     */
-                       /* pointers in this table absolute                 */
-                       jump_table [i] = nacl_inverse_modify_patch_target (code) + GPOINTER_TO_INT (patch_info->data.table->table [i]);
-#else
-                       jump_table [i] = code + GPOINTER_TO_INT (patch_info->data.table->table [i]);
+#if defined(__native_client_codegen__)
+       mono_nacl_fix_patches (cfg->native_code, cfg->patch_info);
 #endif
-               }
 
-#if defined(__native_client__) && defined(__native_client_codegen__)
-               /* jump_table is in the data section, we need to transform */
-               /* it here so when it gets modified in amd64_patch it will */
-               /* then point back to the absolute data address            */
-               target = nacl_inverse_modify_patch_target (jump_table);
-#else
-               target = jump_table;
-#endif
-               break;
-       }
-       case MONO_PATCH_INFO_METHODCONST:
-       case MONO_PATCH_INFO_CLASS:
-       case MONO_PATCH_INFO_IMAGE:
-       case MONO_PATCH_INFO_FIELD:
-       case MONO_PATCH_INFO_SIGNATURE:
-               target = patch_info->data.target;
-               break;
-       case MONO_PATCH_INFO_IID:
-               mono_class_init (patch_info->data.klass);
-               target = GINT_TO_POINTER ((int)patch_info->data.klass->interface_id);
-               break;
-       case MONO_PATCH_INFO_ADJUSTED_IID:
-               mono_class_init (patch_info->data.klass);
-               target = GINT_TO_POINTER ((int)(-((patch_info->data.klass->interface_id + 1) * SIZEOF_VOID_P)));
-               break;
-       case MONO_PATCH_INFO_VTABLE:
-               target = mono_class_vtable (domain, patch_info->data.klass);
-               g_assert (target);
-               break;
-       case MONO_PATCH_INFO_CLASS_INIT: {
-               MonoVTable *vtable = mono_class_vtable (domain, patch_info->data.klass);
+       mono_arch_patch_code (cfg->method, cfg->domain, cfg->native_code, cfg->patch_info, cfg->dynamic_info ? cfg->dynamic_info->code_mp : NULL, cfg->run_cctors);
 
-               g_assert (vtable);
-               target = mono_create_class_init_trampoline (vtable);
-               break;
-       }
-       case MONO_PATCH_INFO_DELEGATE_TRAMPOLINE: {
-               MonoDelegateClassMethodPair *del_tramp = patch_info->data.del_tramp;
-
-               if (del_tramp->virtual)
-                       target = mono_create_delegate_virtual_trampoline (domain, del_tramp->klass, del_tramp->method);
+       if (cfg->method->dynamic) {
+               if (mono_using_xdebug)
+                       mono_domain_code_commit (code_domain, cfg->native_code, cfg->code_size, cfg->code_len);
                else
-                       target = mono_create_delegate_trampoline_info (domain, del_tramp->klass, del_tramp->method);
-               break;
-       }
-       case MONO_PATCH_INFO_SFLDA: {
-               MonoVTable *vtable = mono_class_vtable (domain, patch_info->data.field->parent);
-
-               if (mono_class_field_is_special_static (patch_info->data.field)) {
-                       gpointer addr = NULL;
-
-                       mono_domain_lock (domain);
-                       if (domain->special_static_fields)
-                               addr = g_hash_table_lookup (domain->special_static_fields, patch_info->data.field);
-                       mono_domain_unlock (domain);
-                       g_assert (addr);
-                       return addr;
-               }
-
-               g_assert (vtable);
-               if (!vtable->initialized && !(vtable->klass->flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT) && (method && mono_class_needs_cctor_run (vtable->klass, method)))
-                       /* Done by the generated code */
-                       ;
-               else {
-                       if (run_cctors)
-                               mono_runtime_class_init (vtable);
-               }
-               target = (char*)mono_vtable_get_static_field_data (vtable) + patch_info->data.field->offset;
-               break;
-       }
-       case MONO_PATCH_INFO_RVA: {
-               guint32 field_index = mono_metadata_token_index (patch_info->data.token->token);
-               guint32 rva;
-
-               mono_metadata_field_info (patch_info->data.token->image, field_index - 1, NULL, &rva, NULL);
-               target = mono_image_rva_map (patch_info->data.token->image, rva);
-               break;
-       }
-       case MONO_PATCH_INFO_R4:
-       case MONO_PATCH_INFO_R8:
-               target = patch_info->data.target;
-               break;
-       case MONO_PATCH_INFO_EXC_NAME:
-               target = patch_info->data.name;
-               break;
-       case MONO_PATCH_INFO_LDSTR:
-               target =
-                       mono_ldstr (domain, patch_info->data.token->image, 
-                                               mono_metadata_token_index (patch_info->data.token->token));
-               break;
-       case MONO_PATCH_INFO_TYPE_FROM_HANDLE: {
-               gpointer handle;
-               MonoClass *handle_class;
-               MonoError error;
-
-               handle = mono_ldtoken_checked (patch_info->data.token->image, 
-                                                          patch_info->data.token->token, &handle_class, patch_info->data.token->has_context ? &patch_info->data.token->context : NULL, &error);
-               if (!mono_error_ok (&error))
-                       g_error ("Could not patch ldtoken due to %s", mono_error_get_message (&error));
-               mono_class_init (handle_class);
-               mono_class_init (mono_class_from_mono_type (handle));
-
-               target =
-                       mono_type_get_object (domain, handle);
-               break;
-       }
-       case MONO_PATCH_INFO_LDTOKEN: {
-               gpointer handle;
-               MonoClass *handle_class;
-               MonoError error;
-               
-               handle = mono_ldtoken_checked (patch_info->data.token->image,
-                                                          patch_info->data.token->token, &handle_class, patch_info->data.token->has_context ? &patch_info->data.token->context : NULL, &error);
-               if (!mono_error_ok (&error))
-                       g_error ("Could not patch ldtoken due to %s", mono_error_get_message (&error));
-               mono_class_init (handle_class);
-               
-               target = handle;
-               break;
-       }
-       case MONO_PATCH_INFO_DECLSEC:
-               target = (mono_metadata_blob_heap (patch_info->data.token->image, patch_info->data.token->token) + 2);
-               break;
-       case MONO_PATCH_INFO_ICALL_ADDR:
-               /* run_cctors == 0 -> AOT */
-               if (patch_info->data.method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-                       const char *exc_class;
-                       const char *exc_arg;
-
-                       if (run_cctors) {
-                               target = mono_lookup_pinvoke_call (patch_info->data.method, &exc_class, &exc_arg);
-                               if (!target) {
-                                       if (mono_aot_only)
-                                               mono_raise_exception (mono_exception_from_name_msg (mono_defaults.corlib, "System", exc_class, exc_arg));
-                                       g_error ("Unable to resolve pinvoke method '%s' Re-run with MONO_LOG_LEVEL=debug for more information.\n", mono_method_full_name (patch_info->data.method, TRUE));
-                               }
-                       } else {
-                               target = NULL;
-                       }
-               } else {
-                       target = mono_lookup_internal_call (patch_info->data.method);
-
-                       if (!target && run_cctors)
-                               g_error ("Unregistered icall '%s'\n", mono_method_full_name (patch_info->data.method, TRUE));
-               }
-               break;
-       case MONO_PATCH_INFO_INTERRUPTION_REQUEST_FLAG:
-               target = mono_thread_interruption_request_flag ();
-               break;
-       case MONO_PATCH_INFO_METHOD_RGCTX: {
-               MonoVTable *vtable = mono_class_vtable (domain, patch_info->data.method->klass);
-               g_assert (vtable);
-
-               target = mono_method_lookup_rgctx (vtable, mini_method_get_context (patch_info->data.method)->method_inst);
-               break;
+                       mono_code_manager_commit (cfg->dynamic_info->code_mp, cfg->native_code, cfg->code_size, cfg->code_len);
+       } else {
+               mono_domain_code_commit (code_domain, cfg->native_code, cfg->code_size, cfg->code_len);
        }
-       case MONO_PATCH_INFO_BB_OVF:
-       case MONO_PATCH_INFO_EXC_OVF:
-       case MONO_PATCH_INFO_GOT_OFFSET:
-       case MONO_PATCH_INFO_NONE:
-               break;
-       case MONO_PATCH_INFO_RGCTX_FETCH: {
-               MonoJumpInfoRgctxEntry *entry = patch_info->data.rgctx_entry;
-               guint32 slot = -1;
-
-               switch (entry->data->type) {
-               case MONO_PATCH_INFO_CLASS:
-                       slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, &entry->data->data.klass->byval_arg, entry->info_type, mono_method_get_context (entry->method));
-                       break;
-               case MONO_PATCH_INFO_METHOD:
-               case MONO_PATCH_INFO_METHODCONST:
-                       slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, entry->data->data.method, entry->info_type, mono_method_get_context (entry->method));
-                       break;
-               case MONO_PATCH_INFO_FIELD:
-                       slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, entry->data->data.field, entry->info_type, mono_method_get_context (entry->method));
-                       break;
-               case MONO_PATCH_INFO_SIGNATURE:
-                       slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, entry->data->data.sig, entry->info_type, mono_method_get_context (entry->method));
-                       break;
-               case MONO_PATCH_INFO_GSHAREDVT_CALL: {
-                       MonoJumpInfoGSharedVtCall *call_info = g_malloc0 (sizeof (MonoJumpInfoGSharedVtCall)); //mono_domain_alloc0 (domain, sizeof (MonoJumpInfoGSharedVtCall));
-
-                       memcpy (call_info, entry->data->data.gsharedvt, sizeof (MonoJumpInfoGSharedVtCall));
-                       slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, call_info, entry->info_type, mono_method_get_context (entry->method));
-                       break;
-               }
-               case MONO_PATCH_INFO_GSHAREDVT_METHOD: {
-                       MonoGSharedVtMethodInfo *info;
-                       MonoGSharedVtMethodInfo *oinfo = entry->data->data.gsharedvt_method;
-                       int i;
-
-                       /* Make a copy into the domain mempool */
-                       info = g_malloc0 (sizeof (MonoGSharedVtMethodInfo)); //mono_domain_alloc0 (domain, sizeof (MonoGSharedVtMethodInfo));
-                       info->method = oinfo->method;
-                       info->num_entries = oinfo->num_entries;
-                       info->entries = g_malloc0 (sizeof (MonoRuntimeGenericContextInfoTemplate) * info->num_entries);
-                       for (i = 0; i < oinfo->num_entries; ++i) {
-                               MonoRuntimeGenericContextInfoTemplate *otemplate = &oinfo->entries [i];
-                               MonoRuntimeGenericContextInfoTemplate *template = &info->entries [i];
+#if defined(__native_client_codegen__) && defined(__native_client__)
+       cfg->native_code = code_dest;
+#endif
+       mono_profiler_code_buffer_new (cfg->native_code, cfg->code_len, MONO_PROFILER_CODE_BUFFER_METHOD, cfg->method);
+       
+       mono_arch_flush_icache (cfg->native_code, cfg->code_len);
 
-                               memcpy (template, otemplate, sizeof (MonoRuntimeGenericContextInfoTemplate));
-                       }
-                       slot = mono_method_lookup_or_register_info (entry->method, entry->in_mrgctx, info, entry->info_type, mono_method_get_context (entry->method));
-                       break;
-               }
-               default:
-                       g_assert_not_reached ();
-                       break;
-               }
+       mono_debug_close_method (cfg);
 
-               target = mono_create_rgctx_lazy_fetch_trampoline (slot);
-               break;
-       }
-       case MONO_PATCH_INFO_GENERIC_CLASS_INIT:
-               target = mono_create_generic_class_init_trampoline ();
-               break;
-       case MONO_PATCH_INFO_MONITOR_ENTER:
-               target = mono_create_monitor_enter_trampoline ();
-               break;
-       case MONO_PATCH_INFO_MONITOR_ENTER_V4:
-               target = mono_create_monitor_enter_v4_trampoline ();
-               break;
-       case MONO_PATCH_INFO_MONITOR_EXIT:
-               target = mono_create_monitor_exit_trampoline ();
-               break;
-#ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
-       case MONO_PATCH_INFO_SEQ_POINT_INFO:
-               if (!run_cctors)
-                       /* AOT, not needed */
-                       target = NULL;
-               else
-                       target = mono_arch_get_seq_point_info (domain, code);
-               break;
-#endif
-       case MONO_PATCH_INFO_LLVM_IMT_TRAMPOLINE:
-#ifdef MONO_ARCH_LLVM_SUPPORTED
-               g_assert (mono_use_llvm);
-               target = mono_create_llvm_imt_trampoline (domain, patch_info->data.imt_tramp->method, patch_info->data.imt_tramp->vt_offset);
-#else
-               g_assert_not_reached ();
+#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
+       mono_arch_unwindinfo_install_unwind_info (&cfg->arch.unwindinfo, cfg->native_code, cfg->code_len);
 #endif
-               break;
-       case MONO_PATCH_INFO_GC_CARD_TABLE_ADDR: {
-               int card_table_shift_bits;
-               gpointer card_table_mask;
+}
 
-               target = mono_gc_get_card_table (&card_table_shift_bits, &card_table_mask);
-               break;
-       }
-       case MONO_PATCH_INFO_CASTCLASS_CACHE: {
-               target = mono_domain_alloc0 (domain, sizeof (gpointer));
-               break;
-       }
-       case MONO_PATCH_INFO_JIT_TLS_ID: {
-               target = (gpointer) (size_t) mono_jit_tls_id;
-               break;
-       }
-       case MONO_PATCH_INFO_TLS_OFFSET: {
-               int offset;
+static void
+compute_reachable (MonoBasicBlock *bb)
+{
+       int i;
 
-               offset = mini_get_tls_offset (GPOINTER_TO_INT (patch_info->data.target));
-#ifdef MONO_ARCH_HAVE_TRANSLATE_TLS_OFFSET
-               offset = mono_arch_translate_tls_offset (offset);
-#endif
-               target = GINT_TO_POINTER (offset);
-               break;
-       }
-       case MONO_PATCH_INFO_OBJC_SELECTOR_REF: {
-               target = NULL;
-               break;
-       }
-       case MONO_PATCH_INFO_LDSTR_LIT: {
-               target = mono_string_new (domain, patch_info->data.target);
-               break;
-       }
-       default:
-               g_assert_not_reached ();
+       if (!(bb->flags & BB_VISITED)) {
+               bb->flags |= BB_VISITED;
+               for (i = 0; i < bb->out_count; ++i)
+                       compute_reachable (bb->out_bb [i]);
        }
-
-       return (gpointer)target;
 }
 
-void
-mono_add_seq_point (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, int native_offset)
+static void
+mono_handle_out_of_line_bblock (MonoCompile *cfg)
 {
-       ins->inst_offset = native_offset;
-       g_ptr_array_add (cfg->seq_points, ins);
-       if (bb) {
-               bb->seq_points = g_slist_prepend_mempool (cfg->mempool, bb->seq_points, ins);
-               bb->last_seq_point = ins;
+       MonoBasicBlock *bb;
+       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+               if (bb->next_bb && bb->next_bb->out_of_line && bb->last_ins && !MONO_IS_BRANCH_OP (bb->last_ins)) {
+                       MonoInst *ins;
+                       MONO_INST_NEW (cfg, ins, OP_BR);
+                       MONO_ADD_INS (bb, ins);
+                       ins->inst_target_bb = bb->next_bb;
+               }
        }
 }
 
-void
-mono_add_var_location (MonoCompile *cfg, MonoInst *var, gboolean is_reg, int reg, int offset, int from, int to)
+#endif /* #ifndef DISABLE_JIT */
+
+static MonoJitInfo*
+create_jit_info_for_trampoline (MonoMethod *wrapper, MonoTrampInfo *info)
 {
-       MonoDwarfLocListEntry *entry = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoDwarfLocListEntry));
+       MonoDomain *domain = mono_get_root_domain ();
+       MonoJitInfo *jinfo;
+       guint8 *uw_info;
+       guint32 info_len;
 
-       if (is_reg)
-               g_assert (offset == 0);
+       if (info->uw_info) {
+               uw_info = info->uw_info;
+               info_len = info->uw_info_len;
+       } else {
+               uw_info = mono_unwind_ops_encode (info->unwind_ops, &info_len);
+       }
 
-       entry->is_reg = is_reg;
-       entry->reg = reg;
-       entry->offset = offset;
-       entry->from = from;
-       entry->to = to;
+       jinfo = mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO);
+       jinfo->d.method = wrapper;
+       jinfo->code_start = info->code;
+       jinfo->code_size = info->code_size;
+       jinfo->unwind_info = mono_cache_unwind_info (uw_info, info_len);
 
-       if (var == cfg->args [0])
-               cfg->this_loclist = g_slist_append_mempool (cfg->mempool, cfg->this_loclist, entry);
-       else if (var == cfg->rgctx_var)
-               cfg->rgctx_loclist = g_slist_append_mempool (cfg->mempool, cfg->rgctx_loclist, entry);
+       if (!info->uw_info)
+               g_free (uw_info);
+
+       return jinfo;
 }
 
 #ifndef DISABLE_JIT
 
-static void
-mono_compile_create_vars (MonoCompile *cfg)
+static MonoJitInfo*
+create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
 {
-       MonoMethodSignature *sig;
+       GSList *tmp;
        MonoMethodHeader *header;
-       int i;
+       MonoJitInfo *jinfo;
+       MonoJitInfoFlags flags = JIT_INFO_NONE;
+       int num_clauses, num_holes = 0;
+       guint32 stack_size = 0;
 
+       g_assert (method_to_compile == cfg->method);
        header = cfg->header;
 
-       sig = mono_method_signature (cfg->method);
-       
-       if (!MONO_TYPE_IS_VOID (sig->ret)) {
-               cfg->ret = mono_compile_create_var (cfg, sig->ret, OP_ARG);
-               /* Inhibit optimizations */
-               cfg->ret->flags |= MONO_INST_VOLATILE;
-       }
-       if (cfg->verbose_level > 2)
-               g_print ("creating vars\n");
+       if (cfg->generic_sharing_context)
+               flags |= JIT_INFO_HAS_GENERIC_JIT_INFO;
 
-       cfg->args = mono_mempool_alloc0 (cfg->mempool, (sig->param_count + sig->hasthis) * sizeof (MonoInst*));
+       if (cfg->arch_eh_jit_info) {
+               MonoJitArgumentInfo *arg_info;
+               MonoMethodSignature *sig = mono_method_signature (cfg->method_to_register);
 
-       if (sig->hasthis)
-               cfg->args [0] = mono_compile_create_var (cfg, &cfg->method->klass->this_arg, OP_ARG);
+               /*
+                * This cannot be computed during stack walking, as
+                * mono_arch_get_argument_info () is not signal safe.
+                */
+               arg_info = g_newa (MonoJitArgumentInfo, sig->param_count + 1);
+               stack_size = mono_arch_get_argument_info (cfg->generic_sharing_context, sig, sig->param_count, arg_info);
 
-       for (i = 0; i < sig->param_count; ++i) {
-               cfg->args [i + sig->hasthis] = mono_compile_create_var (cfg, sig->params [i], OP_ARG);
+               if (stack_size)
+                       flags |= JIT_INFO_HAS_ARCH_EH_INFO;
        }
 
-       if (cfg->verbose_level > 2) {
-               if (cfg->ret) {
-                       printf ("\treturn : ");
-                       mono_print_ins (cfg->ret);
-               }
-
-               if (sig->hasthis) {
-                       printf ("\tthis: ");
-                       mono_print_ins (cfg->args [0]);
-               }
+       if (cfg->has_unwind_info_for_epilog && !(flags & JIT_INFO_HAS_ARCH_EH_INFO))
+               flags |= JIT_INFO_HAS_ARCH_EH_INFO;
+               
+       if (cfg->try_block_holes) {
+               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                       TryBlockHole *hole = tmp->data;
+                       MonoExceptionClause *ec = hole->clause;
+                       int hole_end = hole->basic_block->native_offset + hole->basic_block->native_length;
+                       MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
+                       g_assert (clause_last_bb);
 
-               for (i = 0; i < sig->param_count; ++i) {
-                       printf ("\targ [%d]: ", i);
-                       mono_print_ins (cfg->args [i + sig->hasthis]);
+                       /* Holes at the end of a try region can be represented by simply reducing the size of the block itself.*/
+                       if (clause_last_bb->native_offset != hole_end)
+                               ++num_holes;
                }
+               if (num_holes)
+                       flags |= JIT_INFO_HAS_TRY_BLOCK_HOLES;
+               if (G_UNLIKELY (cfg->verbose_level >= 4))
+                       printf ("Number of try block holes %d\n", num_holes);
        }
 
-       cfg->locals_start = cfg->num_varinfo;
-       cfg->locals = mono_mempool_alloc0 (cfg->mempool, header->num_locals * sizeof (MonoInst*));
+       if (mono_security_method_has_declsec (cfg->method_to_register))
+               flags |= JIT_INFO_HAS_ARCH_EH_INFO;
 
-       if (cfg->verbose_level > 2)
-               g_print ("creating locals\n");
+       if (COMPILE_LLVM (cfg))
+               num_clauses = cfg->llvm_ex_info_len;
+       else
+               num_clauses = header->num_clauses;
 
-       for (i = 0; i < header->num_locals; ++i)
-               cfg->locals [i] = mono_compile_create_var (cfg, header->locals [i], OP_LOCAL);
+       if (cfg->method->dynamic)
+               jinfo = g_malloc0 (mono_jit_info_size (flags, num_clauses, num_holes));
+       else
+               jinfo = mono_domain_alloc0 (cfg->domain, mono_jit_info_size (flags, num_clauses, num_holes));
+       mono_jit_info_init (jinfo, cfg->method_to_register, cfg->native_code, cfg->code_len, flags, num_clauses, num_holes);
+       jinfo->domain_neutral = (cfg->opt & MONO_OPT_SHARED) != 0;
 
-       if (cfg->verbose_level > 2)
-               g_print ("locals done\n");
+       if (COMPILE_LLVM (cfg))
+               jinfo->from_llvm = TRUE;
 
-       mono_arch_create_vars (cfg);
+       if (cfg->generic_sharing_context) {
+               MonoInst *inst;
+               MonoGenericJitInfo *gi;
+               GSList *loclist = NULL;
 
-       if (cfg->method->save_lmf && cfg->create_lmf_var) {
-               MonoInst *lmf_var = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_LOCAL);
-               lmf_var->flags |= MONO_INST_VOLATILE;
-               lmf_var->flags |= MONO_INST_LMF;
-               cfg->lmf_var = lmf_var;
-       }
-}
-
-void
-mono_print_code (MonoCompile *cfg, const char* msg)
-{
-       MonoBasicBlock *bb;
-       
-       for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
-               mono_print_bb (bb, msg);
-}
-
-static void
-mono_postprocess_patches (MonoCompile *cfg)
-{
-       MonoJumpInfo *patch_info;
-       int i;
+               gi = mono_jit_info_get_generic_jit_info (jinfo);
+               g_assert (gi);
 
-       for (patch_info = cfg->patch_info; patch_info; patch_info = patch_info->next) {
-               switch (patch_info->type) {
-               case MONO_PATCH_INFO_ABS: {
-                       MonoJitICallInfo *info = mono_find_jit_icall_by_addr (patch_info->data.target);
+               if (cfg->method->dynamic)
+                       gi->generic_sharing_context = g_new0 (MonoGenericSharingContext, 1);
+               else
+                       gi->generic_sharing_context = mono_domain_alloc0 (cfg->domain, sizeof (MonoGenericSharingContext));
+               mini_init_gsctx (cfg->method->dynamic ? NULL : cfg->domain, NULL, cfg->gsctx_context, gi->generic_sharing_context);
 
-                       /*
-                        * Change patches of type MONO_PATCH_INFO_ABS into patches describing the 
-                        * absolute address.
-                        */
-                       if (info) {
-                               //printf ("TEST %s %p\n", info->name, patch_info->data.target);
-                               /* for these array methods we currently register the same function pointer
-                                * since it's a vararg function. But this means that mono_find_jit_icall_by_addr ()
-                                * will return the incorrect one depending on the order they are registered.
-                                * See tests/test-arr.cs
-                                */
-                               if (strstr (info->name, "ves_array_new_va_") == NULL && strstr (info->name, "ves_array_element_address_") == NULL) {
-                                       patch_info->type = MONO_PATCH_INFO_INTERNAL_METHOD;
-                                       patch_info->data.name = info->name;
-                               }
-                       }
+               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
+                               mini_method_get_context (method_to_compile)->method_inst ||
+                               method_to_compile->klass->valuetype) {
+                       g_assert (cfg->rgctx_var);
+               }
 
-                       if (patch_info->type == MONO_PATCH_INFO_ABS) {
-                               if (cfg->abs_patches) {
-                                       MonoJumpInfo *abs_ji = g_hash_table_lookup (cfg->abs_patches, patch_info->data.target);
-                                       if (abs_ji) {
-                                               patch_info->type = abs_ji->type;
-                                               patch_info->data.target = abs_ji->data.target;
-                                       }
-                               }
-                       }
+               gi->has_this = 1;
 
-                       break;
+               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
+                               mini_method_get_context (method_to_compile)->method_inst ||
+                               method_to_compile->klass->valuetype) {
+                       inst = cfg->rgctx_var;
+                       if (!COMPILE_LLVM (cfg))
+                               g_assert (inst->opcode == OP_REGOFFSET);
+                       loclist = cfg->rgctx_loclist;
+               } else {
+                       inst = cfg->args [0];
+                       loclist = cfg->this_loclist;
                }
-               case MONO_PATCH_INFO_SWITCH: {
-                       gpointer *table;
-#if defined(__native_client__) && defined(__native_client_codegen__)
-                       /* This memory will leak.  */
-                       /* TODO: can we free this when  */
-                       /* making the final jump table? */
-                       table = g_malloc0 (sizeof(gpointer) * patch_info->data.table->table_size);
-#else
-                       if (cfg->method->dynamic) {
-                               table = mono_code_manager_reserve (cfg->dynamic_info->code_mp, sizeof (gpointer) * patch_info->data.table->table_size);
-                       } else {
-                               table = mono_domain_code_reserve (cfg->domain, sizeof (gpointer) * patch_info->data.table->table_size);
-                       }
-#endif
 
-                       for (i = 0; i < patch_info->data.table->table_size; i++) {
-                               /* Might be NULL if the switch is eliminated */
-                               if (patch_info->data.table->table [i]) {
-                                       g_assert (patch_info->data.table->table [i]->native_offset);
-                                       table [i] = GINT_TO_POINTER (patch_info->data.table->table [i]->native_offset);
-                               } else {
-                                       table [i] = NULL;
-                               }
-                       }
-                       patch_info->data.table->table = (MonoBasicBlock**)table;
-                       break;
-               }
-               case MONO_PATCH_INFO_METHOD_JUMP: {
-                       MonoJumpList *jlist;
-                       MonoDomain *domain = cfg->domain;
-                       unsigned char *ip = cfg->native_code + patch_info->ip.i;
-#if defined(__native_client__) && defined(__native_client_codegen__)
-                       /* When this jump target gets evaluated, the method */
-                       /* will be installed in the dynamic code section,   */
-                       /* not at the location of cfg->native_code.         */
-                       ip = nacl_inverse_modify_patch_target (cfg->native_code) + patch_info->ip.i;
-#endif
+               if (loclist) {
+                       /* Needed to handle async exceptions */
+                       GSList *l;
+                       int i;
 
-                       mono_domain_lock (domain);
-                       jlist = g_hash_table_lookup (domain_jit_info (domain)->jump_target_hash, patch_info->data.method);
-                       if (!jlist) {
-                               jlist = mono_domain_alloc0 (domain, sizeof (MonoJumpList));
-                               g_hash_table_insert (domain_jit_info (domain)->jump_target_hash, patch_info->data.method, jlist);
+                       gi->nlocs = g_slist_length (loclist);
+                       if (cfg->method->dynamic)
+                               gi->locations = g_malloc0 (gi->nlocs * sizeof (MonoDwarfLocListEntry));
+                       else
+                               gi->locations = mono_domain_alloc0 (cfg->domain, gi->nlocs * sizeof (MonoDwarfLocListEntry));
+                       i = 0;
+                       for (l = loclist; l; l = l->next) {
+                               memcpy (&(gi->locations [i]), l->data, sizeof (MonoDwarfLocListEntry));
+                               i ++;
                        }
-                       jlist->list = g_slist_prepend (jlist->list, ip);
-                       mono_domain_unlock (domain);
-                       break;
-               }
-               default:
-                       /* do nothing */
-                       break;
                }
-       }
-}
-
-void
-mono_codegen (MonoCompile *cfg)
-{
-       MonoBasicBlock *bb;
-       int max_epilog_size;
-       guint8 *code;
-       MonoDomain *code_domain;
-
-       if (mono_using_xdebug)
-               /*
-                * Recent gdb versions have trouble processing symbol files containing
-                * overlapping address ranges, so allocate all code from the code manager
-                * of the root domain. (#666152).
-                */
-               code_domain = mono_get_root_domain ();
-       else
-               code_domain = cfg->domain;
 
-#if defined(__native_client_codegen__) && defined(__native_client__)
-       void *code_dest;
-
-       /* This keeps patch targets from being transformed during
-        * ordinary method compilation, for local branches and jumps.
-        */
-       nacl_allow_target_modification (FALSE);
+               if (COMPILE_LLVM (cfg)) {
+                       g_assert (cfg->llvm_this_reg != -1);
+                       gi->this_in_reg = 0;
+                       gi->this_reg = cfg->llvm_this_reg;
+                       gi->this_offset = cfg->llvm_this_offset;
+               } else if (inst->opcode == OP_REGVAR) {
+                       gi->this_in_reg = 1;
+                       gi->this_reg = inst->dreg;
+               } else {
+                       g_assert (inst->opcode == OP_REGOFFSET);
+#ifdef TARGET_X86
+                       g_assert (inst->inst_basereg == X86_EBP);
+#elif defined(TARGET_AMD64)
+                       g_assert (inst->inst_basereg == X86_EBP || inst->inst_basereg == X86_ESP);
 #endif
+                       g_assert (inst->inst_offset >= G_MININT32 && inst->inst_offset <= G_MAXINT32);
 
-       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-               cfg->spill_count = 0;
-               /* we reuse dfn here */
-               /* bb->dfn = bb_count++; */
+                       gi->this_in_reg = 0;
+                       gi->this_reg = inst->inst_basereg;
+                       gi->this_offset = inst->inst_offset;
+               }
+       }
 
-               mono_arch_lowering_pass (cfg, bb);
+       if (num_holes) {
+               MonoTryBlockHoleTableJitInfo *table;
+               int i;
 
-               if (cfg->opt & MONO_OPT_PEEPHOLE)
-                       mono_arch_peephole_pass_1 (cfg, bb);
+               table = mono_jit_info_get_try_block_hole_table_info (jinfo);
+               table->num_holes = (guint16)num_holes;
+               i = 0;
+               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                       guint32 start_bb_offset;
+                       MonoTryBlockHoleJitInfo *hole;
+                       TryBlockHole *hole_data = tmp->data;
+                       MonoExceptionClause *ec = hole_data->clause;
+                       int hole_end = hole_data->basic_block->native_offset + hole_data->basic_block->native_length;
+                       MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
+                       g_assert (clause_last_bb);
 
-               if (!cfg->globalra)
-                       mono_local_regalloc (cfg, bb);
+                       /* Holes at the end of a try region can be represented by simply reducing the size of the block itself.*/
+                       if (clause_last_bb->native_offset == hole_end)
+                               continue;
 
-               if (cfg->opt & MONO_OPT_PEEPHOLE)
-                       mono_arch_peephole_pass_2 (cfg, bb);
+                       start_bb_offset = hole_data->start_offset - hole_data->basic_block->native_offset;
+                       hole = &table->holes [i++];
+                       hole->clause = hole_data->clause - &header->clauses [0];
+                       hole->offset = (guint32)hole_data->start_offset;
+                       hole->length = (guint16)(hole_data->basic_block->native_length - start_bb_offset);
 
-               if (cfg->gen_seq_points && !cfg->gen_seq_points_debug_data)
-                       bb_deduplicate_op_il_seq_points (cfg, bb);
+                       if (G_UNLIKELY (cfg->verbose_level >= 4))
+                               printf ("\tTry block hole at eh clause %d offset %x length %x\n", hole->clause, hole->offset, hole->length);
+               }
+               g_assert (i == num_holes);
        }
 
-       if (cfg->prof_options & MONO_PROFILE_COVERAGE)
-               cfg->coverage_info = mono_profiler_coverage_alloc (cfg->method, cfg->num_bblocks);
+       if (jinfo->has_arch_eh_info) {
+               MonoArchEHJitInfo *info;
 
-       code = mono_arch_emit_prolog (cfg);
+               info = mono_jit_info_get_arch_eh_info (jinfo);
 
-       cfg->code_len = code - cfg->native_code;
-       cfg->prolog_end = cfg->code_len;
-       cfg->cfa_reg = cfg->cur_cfa_reg;
-       cfg->cfa_offset = cfg->cur_cfa_offset;
+               info->stack_size = stack_size;
+       }
 
-       mono_debug_open_method (cfg);
+       if (COMPILE_LLVM (cfg)) {
+               if (num_clauses)
+                       memcpy (&jinfo->clauses [0], &cfg->llvm_ex_info [0], num_clauses * sizeof (MonoJitExceptionInfo));
+       } else if (header->num_clauses) {
+               int i;
 
-       /* emit code all basic blocks */
-       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-               bb->native_offset = cfg->code_len;
-               bb->real_native_offset = cfg->code_len;
-               //if ((bb == cfg->bb_entry) || !(bb->region == -1 && !bb->dfn))
-                       mono_arch_output_basic_block (cfg, bb);
-               bb->native_length = cfg->code_len - bb->native_offset;
+               for (i = 0; i < header->num_clauses; i++) {
+                       MonoExceptionClause *ec = &header->clauses [i];
+                       MonoJitExceptionInfo *ei = &jinfo->clauses [i];
+                       MonoBasicBlock *tblock;
+                       MonoInst *exvar, *spvar;
 
-               if (bb == cfg->bb_exit) {
-                       cfg->epilog_begin = cfg->code_len;
-                       mono_arch_emit_epilog (cfg);
-                       cfg->epilog_end = cfg->code_len;
-               }
-       }
-
-#ifdef __native_client_codegen__
-       mono_nacl_fix_patches (cfg->native_code, cfg->patch_info);
-#endif
-       mono_arch_emit_exceptions (cfg);
-
-       max_epilog_size = 0;
-
-       /* we always allocate code in cfg->domain->code_mp to increase locality */
-       cfg->code_size = cfg->code_len + max_epilog_size;
-#ifdef __native_client_codegen__
-       cfg->code_size = NACL_BUNDLE_ALIGN_UP (cfg->code_size);
-#endif
-       /* fixme: align to MONO_ARCH_CODE_ALIGNMENT */
-
-       if (cfg->method->dynamic) {
-               guint unwindlen = 0;
-#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
-               unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
-#endif
-               /* Allocate the code into a separate memory pool so it can be freed */
-               cfg->dynamic_info = g_new0 (MonoJitDynamicMethodInfo, 1);
-               cfg->dynamic_info->code_mp = mono_code_manager_new_dynamic ();
-               mono_domain_lock (cfg->domain);
-               mono_dynamic_code_hash_insert (cfg->domain, cfg->method, cfg->dynamic_info);
-               mono_domain_unlock (cfg->domain);
-
-               if (mono_using_xdebug)
-                       /* See the comment for cfg->code_domain */
-                       code = mono_domain_code_reserve (code_domain, cfg->code_size + unwindlen);
-               else
-                       code = mono_code_manager_reserve (cfg->dynamic_info->code_mp, cfg->code_size + unwindlen);
-       } else {
-               guint unwindlen = 0;
-#ifdef MONO_ARCH_HAVE_UNWIND_TABLE
-               unwindlen = mono_arch_unwindinfo_get_size (cfg->arch.unwindinfo);
-#endif
-               code = mono_domain_code_reserve (code_domain, cfg->code_size + unwindlen);
-       }
-#if defined(__native_client_codegen__) && defined(__native_client__)
-       nacl_allow_target_modification (TRUE);
-#endif
-
-       g_assert (code);
-       memcpy (code, cfg->native_code, cfg->code_len);
-#if defined(__default_codegen__)
-       g_free (cfg->native_code);
-#elif defined(__native_client_codegen__)
-       if (cfg->native_code_alloc) {
-               g_free (cfg->native_code_alloc);
-               cfg->native_code_alloc = 0;
-       }
-       else if (cfg->native_code) {
-               g_free (cfg->native_code);
-       }
-#endif /* __native_client_codegen__ */
-       cfg->native_code = code;
-       code = cfg->native_code + cfg->code_len;
-  
-       /* g_assert (((int)cfg->native_code & (MONO_ARCH_CODE_ALIGNMENT - 1)) == 0); */
-       mono_postprocess_patches (cfg);
-
-#ifdef VALGRIND_JIT_REGISTER_MAP
-if (valgrind_register){
-               char* nm = mono_method_full_name (cfg->method, TRUE);
-               VALGRIND_JIT_REGISTER_MAP (nm, cfg->native_code, cfg->native_code + cfg->code_len);
-               g_free (nm);
-       }
-#endif
-       if (cfg->verbose_level > 0) {
-               char* nm = mono_method_full_name (cfg->method, TRUE);
-               g_print ("Method %s emitted at %p to %p (code length %d) [%s]\n", 
-                                nm, 
-                                cfg->native_code, cfg->native_code + cfg->code_len, cfg->code_len, cfg->domain->friendly_name);
-               g_free (nm);
-       }
-
-       {
-               gboolean is_generic = FALSE;
-
-               if (cfg->method->is_inflated || mono_method_get_generic_container (cfg->method) ||
-                               cfg->method->klass->generic_container || cfg->method->klass->generic_class) {
-                       is_generic = TRUE;
-               }
-
-               if (cfg->generic_sharing_context)
-                       g_assert (is_generic);
-       }
-
-#ifdef MONO_ARCH_HAVE_SAVE_UNWIND_INFO
-       mono_arch_save_unwind_info (cfg);
-#endif
-
-#if defined(__native_client_codegen__) && defined(__native_client__)
-       if (!cfg->compile_aot) {
-               if (cfg->method->dynamic) {
-                       code_dest = nacl_code_manager_get_code_dest(cfg->dynamic_info->code_mp, cfg->native_code);
-               } else {
-                       code_dest = nacl_domain_get_code_dest(cfg->domain, cfg->native_code);
-               }
-       }
-#endif
-
-#if defined(__native_client_codegen__)
-       mono_nacl_fix_patches (cfg->native_code, cfg->patch_info);
-#endif
-
-       mono_arch_patch_code (cfg->method, cfg->domain, cfg->native_code, cfg->patch_info, cfg->dynamic_info ? cfg->dynamic_info->code_mp : NULL, cfg->run_cctors);
-
-       if (cfg->method->dynamic) {
-               if (mono_using_xdebug)
-                       mono_domain_code_commit (code_domain, cfg->native_code, cfg->code_size, cfg->code_len);
-               else
-                       mono_code_manager_commit (cfg->dynamic_info->code_mp, cfg->native_code, cfg->code_size, cfg->code_len);
-       } else {
-               mono_domain_code_commit (code_domain, cfg->native_code, cfg->code_size, cfg->code_len);
-       }
-#if defined(__native_client_codegen__) && defined(__native_client__)
-       cfg->native_code = code_dest;
-#endif
-       mono_profiler_code_buffer_new (cfg->native_code, cfg->code_len, MONO_PROFILER_CODE_BUFFER_METHOD, cfg->method);
-       
-       mono_arch_flush_icache (cfg->native_code, cfg->code_len);
-
-       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);
-#endif
-}
-
-static void
-compute_reachable (MonoBasicBlock *bb)
-{
-       int i;
-
-       if (!(bb->flags & BB_VISITED)) {
-               bb->flags |= BB_VISITED;
-               for (i = 0; i < bb->out_count; ++i)
-                       compute_reachable (bb->out_bb [i]);
-       }
-}
-
-static void
-mono_handle_out_of_line_bblock (MonoCompile *cfg)
-{
-       MonoBasicBlock *bb;
-       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-               if (bb->next_bb && bb->next_bb->out_of_line && bb->last_ins && !MONO_IS_BRANCH_OP (bb->last_ins)) {
-                       MonoInst *ins;
-                       MONO_INST_NEW (cfg, ins, OP_BR);
-                       MONO_ADD_INS (bb, ins);
-                       ins->inst_target_bb = bb->next_bb;
-               }
-       }
-}
-
-#endif /* #ifndef DISABLE_JIT */
-
-static MonoJitInfo*
-create_jit_info_for_trampoline (MonoMethod *wrapper, MonoTrampInfo *info)
-{
-       MonoDomain *domain = mono_get_root_domain ();
-       MonoJitInfo *jinfo;
-       guint8 *uw_info;
-       guint32 info_len;
-
-       if (info->uw_info) {
-               uw_info = info->uw_info;
-               info_len = info->uw_info_len;
-       } else {
-               uw_info = mono_unwind_ops_encode (info->unwind_ops, &info_len);
-       }
-
-       jinfo = mono_domain_alloc0 (domain, MONO_SIZEOF_JIT_INFO);
-       jinfo->d.method = wrapper;
-       jinfo->code_start = info->code;
-       jinfo->code_size = info->code_size;
-       jinfo->unwind_info = mono_cache_unwind_info (uw_info, info_len);
-
-       if (!info->uw_info)
-               g_free (uw_info);
-
-       return jinfo;
-}
-
-#ifndef DISABLE_JIT
-
-static MonoJitInfo*
-create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
-{
-       GSList *tmp;
-       MonoMethodHeader *header;
-       MonoJitInfo *jinfo;
-       MonoJitInfoFlags flags = JIT_INFO_NONE;
-       int num_clauses, num_holes = 0;
-       guint32 stack_size = 0;
-
-       g_assert (method_to_compile == cfg->method);
-       header = cfg->header;
-
-       if (cfg->generic_sharing_context)
-               flags |= JIT_INFO_HAS_GENERIC_JIT_INFO;
-
-       if (cfg->arch_eh_jit_info) {
-               MonoJitArgumentInfo *arg_info;
-               MonoMethodSignature *sig = mono_method_signature (cfg->method_to_register);
-
-               /*
-                * This cannot be computed during stack walking, as
-                * mono_arch_get_argument_info () is not signal safe.
-                */
-               arg_info = g_newa (MonoJitArgumentInfo, sig->param_count + 1);
-               stack_size = mono_arch_get_argument_info (cfg->generic_sharing_context, sig, sig->param_count, arg_info);
-
-               if (stack_size)
-                       flags |= JIT_INFO_HAS_ARCH_EH_INFO;
-       }
-
-       if (cfg->has_unwind_info_for_epilog && !(flags & JIT_INFO_HAS_ARCH_EH_INFO))
-               flags |= JIT_INFO_HAS_ARCH_EH_INFO;
-               
-       if (cfg->try_block_holes) {
-               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
-                       TryBlockHole *hole = tmp->data;
-                       MonoExceptionClause *ec = hole->clause;
-                       int hole_end = hole->basic_block->native_offset + hole->basic_block->native_length;
-                       MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
-                       g_assert (clause_last_bb);
-
-                       /* Holes at the end of a try region can be represented by simply reducing the size of the block itself.*/
-                       if (clause_last_bb->native_offset != hole_end)
-                               ++num_holes;
-               }
-               if (num_holes)
-                       flags |= JIT_INFO_HAS_TRY_BLOCK_HOLES;
-               if (G_UNLIKELY (cfg->verbose_level >= 4))
-                       printf ("Number of try block holes %d\n", num_holes);
-       }
-
-       if (mono_security_method_has_declsec (cfg->method_to_register))
-               flags |= JIT_INFO_HAS_ARCH_EH_INFO;
-
-       if (COMPILE_LLVM (cfg))
-               num_clauses = cfg->llvm_ex_info_len;
-       else
-               num_clauses = header->num_clauses;
-
-       if (cfg->method->dynamic)
-               jinfo = g_malloc0 (mono_jit_info_size (flags, num_clauses, num_holes));
-       else
-               jinfo = mono_domain_alloc0 (cfg->domain, mono_jit_info_size (flags, num_clauses, num_holes));
-       mono_jit_info_init (jinfo, cfg->method_to_register, cfg->native_code, cfg->code_len, flags, num_clauses, num_holes);
-       jinfo->domain_neutral = (cfg->opt & MONO_OPT_SHARED) != 0;
-
-       if (COMPILE_LLVM (cfg))
-               jinfo->from_llvm = TRUE;
-
-       if (cfg->generic_sharing_context) {
-               MonoInst *inst;
-               MonoGenericJitInfo *gi;
-               GSList *loclist = NULL;
-
-               gi = mono_jit_info_get_generic_jit_info (jinfo);
-               g_assert (gi);
-
-               if (cfg->method->dynamic)
-                       gi->generic_sharing_context = g_new0 (MonoGenericSharingContext, 1);
-               else
-                       gi->generic_sharing_context = mono_domain_alloc0 (cfg->domain, sizeof (MonoGenericSharingContext));
-               mini_init_gsctx (cfg->method->dynamic ? NULL : cfg->domain, NULL, cfg->gsctx_context, gi->generic_sharing_context);
-
-               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
-                               mini_method_get_context (method_to_compile)->method_inst ||
-                               method_to_compile->klass->valuetype) {
-                       g_assert (cfg->rgctx_var);
-               }
-
-               gi->has_this = 1;
-
-               if ((method_to_compile->flags & METHOD_ATTRIBUTE_STATIC) ||
-                               mini_method_get_context (method_to_compile)->method_inst ||
-                               method_to_compile->klass->valuetype) {
-                       inst = cfg->rgctx_var;
-                       if (!COMPILE_LLVM (cfg))
-                               g_assert (inst->opcode == OP_REGOFFSET);
-                       loclist = cfg->rgctx_loclist;
-               } else {
-                       inst = cfg->args [0];
-                       loclist = cfg->this_loclist;
-               }
-
-               if (loclist) {
-                       /* Needed to handle async exceptions */
-                       GSList *l;
-                       int i;
-
-                       gi->nlocs = g_slist_length (loclist);
-                       if (cfg->method->dynamic)
-                               gi->locations = g_malloc0 (gi->nlocs * sizeof (MonoDwarfLocListEntry));
-                       else
-                               gi->locations = mono_domain_alloc0 (cfg->domain, gi->nlocs * sizeof (MonoDwarfLocListEntry));
-                       i = 0;
-                       for (l = loclist; l; l = l->next) {
-                               memcpy (&(gi->locations [i]), l->data, sizeof (MonoDwarfLocListEntry));
-                               i ++;
-                       }
-               }
-
-               if (COMPILE_LLVM (cfg)) {
-                       g_assert (cfg->llvm_this_reg != -1);
-                       gi->this_in_reg = 0;
-                       gi->this_reg = cfg->llvm_this_reg;
-                       gi->this_offset = cfg->llvm_this_offset;
-               } else if (inst->opcode == OP_REGVAR) {
-                       gi->this_in_reg = 1;
-                       gi->this_reg = inst->dreg;
-               } else {
-                       g_assert (inst->opcode == OP_REGOFFSET);
-#ifdef TARGET_X86
-                       g_assert (inst->inst_basereg == X86_EBP);
-#elif defined(TARGET_AMD64)
-                       g_assert (inst->inst_basereg == X86_EBP || inst->inst_basereg == X86_ESP);
-#endif
-                       g_assert (inst->inst_offset >= G_MININT32 && inst->inst_offset <= G_MAXINT32);
-
-                       gi->this_in_reg = 0;
-                       gi->this_reg = inst->inst_basereg;
-                       gi->this_offset = inst->inst_offset;
-               }
-       }
-
-       if (num_holes) {
-               MonoTryBlockHoleTableJitInfo *table;
-               int i;
-
-               table = mono_jit_info_get_try_block_hole_table_info (jinfo);
-               table->num_holes = (guint16)num_holes;
-               i = 0;
-               for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
-                       guint32 start_bb_offset;
-                       MonoTryBlockHoleJitInfo *hole;
-                       TryBlockHole *hole_data = tmp->data;
-                       MonoExceptionClause *ec = hole_data->clause;
-                       int hole_end = hole_data->basic_block->native_offset + hole_data->basic_block->native_length;
-                       MonoBasicBlock *clause_last_bb = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
-                       g_assert (clause_last_bb);
-
-                       /* Holes at the end of a try region can be represented by simply reducing the size of the block itself.*/
-                       if (clause_last_bb->native_offset == hole_end)
-                               continue;
-
-                       start_bb_offset = hole_data->start_offset - hole_data->basic_block->native_offset;
-                       hole = &table->holes [i++];
-                       hole->clause = hole_data->clause - &header->clauses [0];
-                       hole->offset = (guint32)hole_data->start_offset;
-                       hole->length = (guint16)(hole_data->basic_block->native_length - start_bb_offset);
-
-                       if (G_UNLIKELY (cfg->verbose_level >= 4))
-                               printf ("\tTry block hole at eh clause %d offset %x length %x\n", hole->clause, hole->offset, hole->length);
-               }
-               g_assert (i == num_holes);
-       }
-
-       if (jinfo->has_arch_eh_info) {
-               MonoArchEHJitInfo *info;
-
-               info = mono_jit_info_get_arch_eh_info (jinfo);
-
-               info->stack_size = stack_size;
-       }
-
-       if (COMPILE_LLVM (cfg)) {
-               if (num_clauses)
-                       memcpy (&jinfo->clauses [0], &cfg->llvm_ex_info [0], num_clauses * sizeof (MonoJitExceptionInfo));
-       } else if (header->num_clauses) {
-               int i;
-
-               for (i = 0; i < header->num_clauses; i++) {
-                       MonoExceptionClause *ec = &header->clauses [i];
-                       MonoJitExceptionInfo *ei = &jinfo->clauses [i];
-                       MonoBasicBlock *tblock;
-                       MonoInst *exvar, *spvar;
-
-                       ei->flags = ec->flags;
-
-                       /*
-                        * The spvars are needed by mono_arch_install_handler_block_guard ().
-                        */
-                       if (ei->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
-                               int region;
-
-                               region = ((i + 1) << 8) | MONO_REGION_FINALLY | ec->flags;
-                               spvar = mono_find_spvar_for_region (cfg, region);
-                               g_assert (spvar);
-                               ei->exvar_offset = spvar->inst_offset;
-                       } else {
-                               exvar = mono_find_exvar_for_offset (cfg, ec->handler_offset);
-                               ei->exvar_offset = exvar ? exvar->inst_offset : 0;
-                       }
-
-                       if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
-                               tblock = cfg->cil_offset_to_bb [ec->data.filter_offset];
-                               g_assert (tblock);
-                               ei->data.filter = cfg->native_code + tblock->native_offset;
-                       } else {
-                               ei->data.catch_class = ec->data.catch_class;
-                       }
-
-                       tblock = cfg->cil_offset_to_bb [ec->try_offset];
-                       g_assert (tblock);
-                       g_assert (tblock->native_offset);
-                       ei->try_start = cfg->native_code + tblock->native_offset;
-                       if (tblock->extend_try_block) {
-                               /*
-                                * Extend the try block backwards to include parts of the previous call
-                                * instruction.
-                                */
-                               ei->try_start = (guint8*)ei->try_start - MONO_ARCH_MONITOR_ENTER_ADJUSTMENT;
-                       }
-                       tblock = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
-                       g_assert (tblock);
-                       if (!tblock->native_offset) {
-                               int j, end;
-                               for (j = ec->try_offset + ec->try_len, end = ec->try_offset; j >= end; --j) {
-                                       MonoBasicBlock *bb = cfg->cil_offset_to_bb [j];
-                                       if (bb && bb->native_offset) {
-                                               tblock = bb;
-                                               break;
-                                       }
-                               }
-                       }
-                       ei->try_end = cfg->native_code + tblock->native_offset;
-                       g_assert (tblock->native_offset);
-                       tblock = cfg->cil_offset_to_bb [ec->handler_offset];
-                       g_assert (tblock);
-                       ei->handler_start = cfg->native_code + tblock->native_offset;
-
-                       for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
-                               TryBlockHole *hole = tmp->data;
-                               gpointer hole_end = cfg->native_code + (hole->basic_block->native_offset + hole->basic_block->native_length);
-                               if (hole->clause == ec && hole_end == ei->try_end) {
-                                       if (G_UNLIKELY (cfg->verbose_level >= 4))
-                                               printf ("\tShortening try block %d from %x to %x\n", i, (int)((guint8*)ei->try_end - cfg->native_code), hole->start_offset);
-
-                                       ei->try_end = cfg->native_code + hole->start_offset;
-                                       break;
-                               }
-                       }
-
-                       if (ec->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
-                               int end_offset;
-                               if (ec->handler_offset + ec->handler_len < header->code_size) {
-                                       tblock = cfg->cil_offset_to_bb [ec->handler_offset + ec->handler_len];
-                                       if (tblock->native_offset) {
-                                               end_offset = tblock->native_offset;
-                                       } else {
-                                               int j, end;
-
-                                               for (j = ec->handler_offset + ec->handler_len, end = ec->handler_offset; j >= end; --j) {
-                                                       MonoBasicBlock *bb = cfg->cil_offset_to_bb [j];
-                                                       if (bb && bb->native_offset) {
-                                                               tblock = bb;
-                                                               break;
-                                                       }
-                                               }
-                                               end_offset = tblock->native_offset +  tblock->native_length;
-                                       }
-                               } else {
-                                       end_offset = cfg->epilog_begin;
-                               }
-                               ei->data.handler_end = cfg->native_code + end_offset;
-                       }
-               }
-       }
-
-       if (G_UNLIKELY (cfg->verbose_level >= 4)) {
-               int i;
-               for (i = 0; i < jinfo->num_clauses; i++) {
-                       MonoJitExceptionInfo *ei = &jinfo->clauses [i];
-                       int start = (guint8*)ei->try_start - cfg->native_code;
-                       int end = (guint8*)ei->try_end - cfg->native_code;
-                       int handler = (guint8*)ei->handler_start - cfg->native_code;
-                       int handler_end = (guint8*)ei->data.handler_end - cfg->native_code;
-
-                       printf ("JitInfo EH clause %d flags %x try %x-%x handler %x-%x\n", i, ei->flags, start, end, handler, handler_end);
-               }
-       }
-
-       if (cfg->encoded_unwind_ops) {
-               /* Generated by LLVM */
-               jinfo->unwind_info = mono_cache_unwind_info (cfg->encoded_unwind_ops, cfg->encoded_unwind_ops_len);
-               g_free (cfg->encoded_unwind_ops);
-       } else if (cfg->unwind_ops) {
-               guint32 info_len;
-               guint8 *unwind_info = mono_unwind_ops_encode (cfg->unwind_ops, &info_len);
-               guint32 unwind_desc;
-
-               unwind_desc = mono_cache_unwind_info (unwind_info, info_len);
-
-               if (cfg->has_unwind_info_for_epilog) {
-                       MonoArchEHJitInfo *info;
-
-                       info = mono_jit_info_get_arch_eh_info (jinfo);
-                       g_assert (info);
-                       info->epilog_size = cfg->code_len - cfg->epilog_begin;
-               }
-               jinfo->unwind_info = unwind_desc;
-               g_free (unwind_info);
-       } else {
-               jinfo->unwind_info = cfg->used_int_regs;
-       }
-
-       return jinfo;
-}
-#endif
-
-static MonoType*
-get_gsharedvt_type (MonoType *t)
-{
-       MonoGenericParam *par = t->data.generic_param;
-       MonoGenericParam *copy;
-       MonoType *res;
-       MonoImage *image = NULL;
-
-       /* 
-        * Create an anonymous gparam with a different serial so normal gshared and gsharedvt methods have
-        * a different instantiation.
-        */
-       g_assert (mono_generic_param_info (par));
-       if (par->owner) {
-               image = par->owner->image;
-
-               mono_image_lock (image);
-               if (!image->gsharedvt_types)
-                       image->gsharedvt_types = g_hash_table_new (NULL, NULL);
-               res = g_hash_table_lookup (image->gsharedvt_types, par);
-               mono_image_unlock (image);
-               if (res)
-                       return res;
-               copy = mono_image_alloc0 (image, sizeof (MonoGenericParamFull));
-               memcpy (copy, par, sizeof (MonoGenericParamFull));
-       } else {
-               copy = g_memdup (par, sizeof (MonoGenericParam));
-       }
-       copy->owner = NULL;
-       // FIXME:
-       copy->image = mono_defaults.corlib;
-       copy->serial = 1;
-       res = mono_metadata_type_dup (NULL, t);
-       res->data.generic_param = copy;
-
-       if (par->owner) {
-               mono_image_lock (image);
-               /* Duplicates are ok */
-               g_hash_table_insert (image->gsharedvt_types, par, res);
-               mono_image_unlock (image);
-       }
-
-       return res;
-}
-
-static gboolean
-is_gsharedvt_type (MonoType *t)
-{
-       return (t->type == MONO_TYPE_VAR || t->type == MONO_TYPE_MVAR) && t->data.generic_param->serial == 1;
-}
-
-/* Return whenever METHOD is a gsharedvt method */
-static gboolean
-is_gsharedvt_method (MonoMethod *method)
-{
-       MonoGenericContext *context;
-       MonoGenericInst *inst;
-       int i;
-
-       if (!method->is_inflated)
-               return FALSE;
-       context = mono_method_get_context (method);
-       inst = context->class_inst;
-       if (inst) {
-               for (i = 0; i < inst->type_argc; ++i)
-                       if (is_gsharedvt_type (inst->type_argv [i]))
-                               return TRUE;
-       }
-       inst = context->method_inst;
-       if (inst) {
-               for (i = 0; i < inst->type_argc; ++i)
-                       if (is_gsharedvt_type (inst->type_argv [i]))
-                               return TRUE;
-       }
-       return FALSE;
-}
-
-static gboolean
-is_open_method (MonoMethod *method)
-{
-       MonoGenericContext *context;
-
-       if (!method->is_inflated)
-               return FALSE;
-       context = mono_method_get_context (method);
-       if (context->class_inst && context->class_inst->is_open)
-               return TRUE;
-       if (context->method_inst && context->method_inst->is_open)
-               return TRUE;
-       return FALSE;
-}
-
-static MonoGenericInst*
-get_shared_inst (MonoGenericInst *inst, MonoGenericInst *shared_inst, MonoGenericContainer *container, gboolean all_vt, gboolean gsharedvt)
-{
-       MonoGenericInst *res;
-       MonoType **type_argv;
-       int i;
-
-       type_argv = g_new0 (MonoType*, inst->type_argc);
-       for (i = 0; i < inst->type_argc; ++i) {
-               if (!all_vt && (MONO_TYPE_IS_REFERENCE (inst->type_argv [i]) || inst->type_argv [i]->type == MONO_TYPE_VAR || inst->type_argv [i]->type == MONO_TYPE_MVAR)) {
-                       type_argv [i] = shared_inst->type_argv [i];
-               } else if (all_vt) {
-                       type_argv [i] = get_gsharedvt_type (shared_inst->type_argv [i]);
-               } else if (gsharedvt) {
-                       type_argv [i] = get_gsharedvt_type (shared_inst->type_argv [i]);
-               } else {
-                       type_argv [i] = inst->type_argv [i];
-               }
-       }
-
-       res = mono_metadata_get_generic_inst (inst->type_argc, type_argv);
-       g_free (type_argv);
-       return res;
-}
-
-/*
- * mini_get_shared_method_full:
- *
- *   Return the method which is actually compiled/registered when doing generic sharing.
- * If ALL_VT is true, return the shared method belonging to an all-vtype instantiation.
- * If IS_GSHAREDVT is true, treat METHOD as a gsharedvt method even if it fails some constraints.
- * METHOD can be a non-inflated generic method.
- */
-MonoMethod*
-mini_get_shared_method_full (MonoMethod *method, gboolean all_vt, gboolean is_gsharedvt)
-{
-       MonoError error;
-       MonoGenericContext shared_context;
-       MonoMethod *declaring_method, *res;
-       gboolean partial = FALSE;
-       gboolean gsharedvt = FALSE;
-       MonoGenericContainer *class_container, *method_container = NULL;
-
-       if (method->is_generic || (method->klass->generic_container && !method->is_inflated)) {
-               declaring_method = method;
-       } else {
-               declaring_method = mono_method_get_declaring_generic_method (method);
-       }
-
-       if (declaring_method->is_generic)
-               shared_context = mono_method_get_generic_container (declaring_method)->context;
-       else
-               shared_context = declaring_method->klass->generic_container->context;
-
-       /* Handle gsharedvt/partial sharing */
-       if ((method != declaring_method && method->is_inflated && !mono_method_is_generic_sharable_full (method, FALSE, FALSE, TRUE)) ||
-               is_gsharedvt || mini_is_gsharedvt_sharable_method (method)) {
-               MonoGenericContext *context = mono_method_get_context (method);
-               MonoGenericInst *inst;
-
-               partial = mono_method_is_generic_sharable_full (method, FALSE, TRUE, FALSE);
-
-               gsharedvt = is_gsharedvt || (!partial && mini_is_gsharedvt_sharable_method (method));
-
-               class_container = declaring_method->klass->generic_container;
-               method_container = mono_method_get_generic_container (declaring_method);
-
-               /* 
-                * Create the shared context by replacing the ref type arguments with
-                * type parameters, and keeping the rest.
-                */
-               if (context)
-                       inst = context->class_inst;
-               else
-                       inst = shared_context.class_inst;
-               if (inst)
-                       shared_context.class_inst = get_shared_inst (inst, shared_context.class_inst, class_container, all_vt, gsharedvt);
-
-               if (context)
-                       inst = context->method_inst;
-               else
-                       inst = shared_context.method_inst;
-               if (inst)
-                       shared_context.method_inst = get_shared_inst (inst, shared_context.method_inst, method_container, all_vt, gsharedvt);
-
-               partial = TRUE;
-       }
-
-    res = mono_class_inflate_generic_method_checked (declaring_method, &shared_context, &error);
-       g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
-
-       if (!partial) {
-               /* The result should be an inflated method whose parent is not inflated */
-               g_assert (!res->klass->is_inflated);
-       }
-       return res;
-}
-
-MonoMethod*
-mini_get_shared_method (MonoMethod *method)
-{
-       return mini_get_shared_method_full (method, FALSE, FALSE);
-}
-
-void
-mini_init_gsctx (MonoDomain *domain, MonoMemPool *mp, MonoGenericContext *context, MonoGenericSharingContext *gsctx)
-{
-       MonoGenericInst *inst;
-       int i;
-
-       memset (gsctx, 0, sizeof (MonoGenericSharingContext));
-
-       if (context && context->class_inst) {
-               inst = context->class_inst;
-               if (domain)
-                       gsctx->var_is_vt = mono_domain_alloc0 (domain, sizeof (gboolean) * inst->type_argc);
-               else if (mp)
-                       gsctx->var_is_vt = mono_mempool_alloc0 (mp, sizeof (gboolean) * inst->type_argc);
-               else
-                       gsctx->var_is_vt = g_new0 (gboolean, inst->type_argc);
-
-               for (i = 0; i < inst->type_argc; ++i) {
-                       MonoType *type = inst->type_argv [i];
-
-                       if ((type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR) && type->data.generic_param->serial == 1)
-                               gsctx->var_is_vt [i] = TRUE;
-               }
-       }
-       if (context && context->method_inst) {
-               inst = context->method_inst;
-               if (domain)
-                       gsctx->mvar_is_vt = mono_domain_alloc0 (domain, sizeof (gboolean) * inst->type_argc);
-               else if (mp)
-                       gsctx->mvar_is_vt = mono_mempool_alloc0 (mp, sizeof (gboolean) * inst->type_argc);
-               else
-                       gsctx->mvar_is_vt = g_new0 (gboolean, inst->type_argc);
-
-               for (i = 0; i < inst->type_argc; ++i) {
-                       MonoType *type = inst->type_argv [i];
-
-                       if ((type->type == MONO_TYPE_VAR || type->type == MONO_TYPE_MVAR) && type->data.generic_param->serial == 1)
-                               gsctx->mvar_is_vt [i] = TRUE;
-               }
-       }
-}
-
-#ifndef DISABLE_JIT
-/*
- * mini_method_compile:
- * @method: the method to compile
- * @opts: the optimization flags to use
- * @domain: the domain where the method will be compiled in
- * @flags: compilation flags
- * @parts: debug flag
- *
- * Returns: a MonoCompile* pointer. Caller must check the exception_type
- * field in the returned struct to see if compilation succeded.
- */
-MonoCompile*
-mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFlags flags, int parts)
-{
-       MonoMethodHeader *header;
-       MonoMethodSignature *sig;
-       MonoError err;
-       guint8 *ip;
-       MonoCompile *cfg;
-       int dfn, i, code_size_ratio;
-#ifndef DISABLE_SSA
-       gboolean deadce_has_run = FALSE;
-#endif
-       gboolean try_generic_shared, try_llvm = FALSE;
-       MonoMethod *method_to_compile, *method_to_register;
-       gboolean method_is_gshared = FALSE;
-       gboolean run_cctors = (flags & JIT_FLAG_RUN_CCTORS) ? 1 : 0;
-       gboolean compile_aot = (flags & JIT_FLAG_AOT) ? 1 : 0;
-       gboolean full_aot = (flags & JIT_FLAG_FULL_AOT) ? 1 : 0;
-#ifdef ENABLE_LLVM
-       gboolean llvm = (flags & JIT_FLAG_LLVM) ? 1 : 0;
-#endif
-       static gboolean verbose_method_inited;
-       static const char *verbose_method_name;
-
-       InterlockedIncrement (&mono_jit_stats.methods_compiled);
-       if (mono_profiler_get_events () & MONO_PROFILE_JIT_COMPILATION)
-               mono_profiler_method_jit (method);
-       if (MONO_METHOD_COMPILE_BEGIN_ENABLED ())
-               MONO_PROBE_METHOD_COMPILE_BEGIN (method);
-
-       if (compile_aot)
-               /* 
-                * We might get passed the original generic method definition or
-                * instances with type parameters.
-                * FIXME: Remove the method->klass->generic_class limitation.
-                */
-               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
-                       (opts & MONO_OPT_GSHARED) && ((method->is_generic || method->klass->generic_container) || (!method->klass->generic_class && mono_method_is_generic_sharable_full (method, TRUE, FALSE, FALSE)));
-       else
-               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
-                       (opts & MONO_OPT_GSHARED) && mono_method_is_generic_sharable (method, FALSE);
-
-       if (opts & MONO_OPT_GSHARED) {
-               if (try_generic_shared)
-                       mono_stats.generics_sharable_methods++;
-               else if (mono_method_is_generic_impl (method))
-                       mono_stats.generics_unsharable_methods++;
-       }
-
-       if (mini_is_gsharedvt_sharable_method (method)) {
-               if (!mono_debug_count ())
-                       try_generic_shared = FALSE;
-               if (compile_aot)
-                       try_generic_shared = FALSE;
-       }
-
-       if (is_gsharedvt_method (method) || (compile_aot && is_open_method (method))) {
-               /* We are AOTing a gshared method directly */
-               method_is_gshared = TRUE;
-               g_assert (compile_aot);
-               try_generic_shared = TRUE;
-       }
-
-#ifdef ENABLE_LLVM
-       try_llvm = mono_use_llvm || llvm;
-#endif
-
- restart_compile:
-       if (method_is_gshared) {
-               method_to_compile = method;
-       } else {
-               if (try_generic_shared) {
-                       method_to_compile = mini_get_shared_method (method);
-                       g_assert (method_to_compile);
-               } else {
-                       method_to_compile = method;
-               }
-       }
-
-       cfg = g_new0 (MonoCompile, 1);
-       cfg->method = method_to_compile;
-       cfg->header = mono_method_get_header (cfg->method);
-       cfg->mempool = mono_mempool_new ();
-       cfg->opt = opts;
-       cfg->prof_options = mono_profiler_get_events ();
-       cfg->run_cctors = run_cctors;
-       cfg->domain = domain;
-       cfg->verbose_level = mini_verbose;
-       cfg->compile_aot = compile_aot;
-       cfg->full_aot = full_aot;
-       cfg->skip_visibility = method->skip_visibility;
-       cfg->orig_method = method;
-       cfg->gen_seq_points = debug_options.gen_seq_points_compact_data || debug_options.gen_seq_points_debug_data;
-       cfg->gen_seq_points_debug_data = debug_options.gen_seq_points_debug_data;
-
-       cfg->explicit_null_checks = debug_options.explicit_null_checks;
-       cfg->soft_breakpoints = debug_options.soft_breakpoints;
-       cfg->check_pinvoke_callconv = debug_options.check_pinvoke_callconv;
-       if (try_generic_shared)
-               cfg->generic_sharing_context = (MonoGenericSharingContext*)&cfg->gsctx;
-       cfg->compile_llvm = try_llvm;
-       cfg->token_info_hash = g_hash_table_new (NULL, NULL);
-
-       if (cfg->gen_seq_points)
-               cfg->seq_points = g_ptr_array_new ();
-       mono_error_init (&cfg->error);
-
-       if (cfg->compile_aot && !try_generic_shared && (method->is_generic || method->klass->generic_container || method_is_gshared)) {
-               cfg->exception_type = MONO_EXCEPTION_GENERIC_SHARING_FAILED;
-               return cfg;
-       }
-
-       if (cfg->generic_sharing_context && (mini_is_gsharedvt_sharable_method (method) || method_is_gshared)) {
-               MonoMethodInflated *inflated;
-               MonoGenericContext *context;
-
-               if (method_is_gshared) {
-                       g_assert (method->is_inflated);
-                       inflated = (MonoMethodInflated*)method;
-                       context = &inflated->context;
-
-                       /* We are compiling a gsharedvt method directly */
-                       g_assert (compile_aot);
-               } else {
-                       g_assert (method_to_compile->is_inflated);
-                       inflated = (MonoMethodInflated*)method_to_compile;
-                       context = &inflated->context;
-               }
-
-               mini_init_gsctx (NULL, cfg->mempool, context, &cfg->gsctx);
-               cfg->gsctx_context = context;
-
-               cfg->gsharedvt = TRUE;
-               // FIXME:
-               cfg->disable_llvm = TRUE;
-       }
-
-       if (cfg->generic_sharing_context) {
-               method_to_register = method_to_compile;
-               cfg->gshared = TRUE;
-       } else {
-               g_assert (method == method_to_compile);
-               method_to_register = method;
-       }
-       cfg->method_to_register = method_to_register;
-
-       mono_error_init (&err);
-       sig = mono_method_signature_checked (cfg->method, &err);        
-       if (!sig) {
-               cfg->exception_type = MONO_EXCEPTION_TYPE_LOAD;
-               cfg->exception_message = g_strdup (mono_error_get_message (&err));
-               mono_error_cleanup (&err);
-               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
-               return cfg;
-       }
-
-       header = cfg->header;
-       if (!header) {
-               MonoLoaderError *error;
-
-               if ((error = mono_loader_get_last_error ())) {
-                       cfg->exception_type = error->exception_type;
-               } else {
-                       cfg->exception_type = MONO_EXCEPTION_INVALID_PROGRAM;
-                       cfg->exception_message = g_strdup_printf ("Missing or incorrect header for method %s", cfg->method->name);
-               }
-               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
-               return cfg;
-       }
-
-#ifdef ENABLE_LLVM
-       {
-               static gboolean inited;
-
-               if (!inited)
-                       inited = TRUE;
-
-               /* 
-                * Check for methods which cannot be compiled by LLVM early, to avoid
-                * the extra compilation pass.
-                */
-               if (COMPILE_LLVM (cfg)) {
-                       mono_llvm_check_method_supported (cfg);
-                       if (cfg->disable_llvm) {
-                               if (cfg->verbose_level >= 1) {
-                                       //nm = mono_method_full_name (cfg->method, TRUE);
-                                       printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
-                                       //g_free (nm);
-                               }
-                               mono_destroy_compile (cfg);
-                               try_llvm = FALSE;
-                               goto restart_compile;
-                       }
-               }
-       }
-#endif
-
-       /* The debugger has no liveness information, so avoid sharing registers/stack slots */
-       if (debug_options.mdb_optimizations) {
-               cfg->disable_reuse_registers = TRUE;
-               cfg->disable_reuse_stack_slots = TRUE;
-               /* 
-                * This decreases the change the debugger will read registers/stack slots which are
-                * not yet initialized.
-                */
-               cfg->disable_initlocals_opt = TRUE;
-
-               cfg->extend_live_ranges = TRUE;
-
-               /* Temporarily disable this when running in the debugger until we have support
-                * for this in the debugger. */
-               /* This is no longer needed with sdb */
-               //cfg->disable_omit_fp = TRUE;
-
-               /* The debugger needs all locals to be on the stack or in a global register */
-               cfg->disable_vreg_to_lvreg = TRUE;
-
-               /* Don't remove unused variables when running inside the debugger since the user
-                * may still want to view them. */
-               cfg->disable_deadce_vars = TRUE;
-
-               // cfg->opt |= MONO_OPT_SHARED;
-               cfg->opt &= ~MONO_OPT_DEADCE;
-               cfg->opt &= ~MONO_OPT_INLINE;
-               cfg->opt &= ~MONO_OPT_COPYPROP;
-               cfg->opt &= ~MONO_OPT_CONSPROP;
-               /* This is no longer needed with sdb */
-               //cfg->opt &= ~MONO_OPT_GSHARED;
-
-               /* This is needed for the soft debugger, which doesn't like code after the epilog */
-               cfg->disable_out_of_line_bblocks = TRUE;
-       }
-
-       if (mono_using_xdebug) {
-               /* 
-                * Make each variable use its own register/stack slot and extend 
-                * their liveness to cover the whole method, making them displayable
-                * in gdb even after they are dead.
-                */
-               cfg->disable_reuse_registers = TRUE;
-               cfg->disable_reuse_stack_slots = TRUE;
-               cfg->extend_live_ranges = TRUE;
-               cfg->compute_precise_live_ranges = TRUE;
-       }
-
-       mini_gc_init_cfg (cfg);
-
-       if (COMPILE_LLVM (cfg)) {
-               cfg->opt |= MONO_OPT_ABCREM;
-       }
-
-       if (!verbose_method_inited) {
-               verbose_method_name = g_getenv ("MONO_VERBOSE_METHOD");
-               verbose_method_inited = TRUE;
-       }
-       if (verbose_method_name) {
-               const char *name = verbose_method_name;
-
-               if ((strchr (name, '.') > name) || strchr (name, ':')) {
-                       MonoMethodDesc *desc;
-                       
-                       desc = mono_method_desc_new (name, TRUE);
-                       if (mono_method_desc_full_match (desc, cfg->method)) {
-                               cfg->verbose_level = 4;
-                       }
-                       mono_method_desc_free (desc);
-               } else {
-                       if (strcmp (cfg->method->name, name) == 0)
-                               cfg->verbose_level = 4;
-               }
-       }
-
-       ip = (guint8 *)header->code;
-
-       cfg->intvars = mono_mempool_alloc0 (cfg->mempool, sizeof (guint16) * STACK_MAX * header->max_stack);
-
-       if (cfg->verbose_level > 0) {
-               char *method_name;
-
-               method_name = mono_method_full_name (method, TRUE);
-               g_print ("converting %s%s%smethod %s\n", COMPILE_LLVM (cfg) ? "llvm " : "", cfg->gsharedvt ? "gsharedvt " : "", (cfg->generic_sharing_context && !cfg->gsharedvt) ? "gshared " : "", method_name);
-               /*
-               if (COMPILE_LLVM (cfg))
-                       g_print ("converting llvm method %s\n", method_name = mono_method_full_name (method, TRUE));
-               else if (cfg->gsharedvt)
-                       g_print ("converting gsharedvt method %s\n", method_name = mono_method_full_name (method_to_compile, TRUE));
-               else if (cfg->generic_sharing_context)
-                       g_print ("converting shared method %s\n", method_name = mono_method_full_name (method_to_compile, TRUE));
-               else
-                       g_print ("converting method %s\n", method_name = mono_method_full_name (method, TRUE));
-               */
-               g_free (method_name);
-       }
-
-       if (cfg->opt & (MONO_OPT_ABCREM | MONO_OPT_SSAPRE))
-               cfg->opt |= MONO_OPT_SSA;
-
-       /* 
-       if ((cfg->method->klass->image != mono_defaults.corlib) || (strstr (cfg->method->klass->name, "StackOverflowException") && strstr (cfg->method->name, ".ctor")) || (strstr (cfg->method->klass->name, "OutOfMemoryException") && strstr (cfg->method->name, ".ctor")))
-               cfg->globalra = TRUE;
-       */
-
-       //cfg->globalra = TRUE;
-
-       //if (!strcmp (cfg->method->klass->name, "Tests") && !cfg->method->wrapper_type)
-       //      cfg->globalra = TRUE;
-
-       {
-               static int count = 0;
-               count ++;
-
-               /*
-               if (g_getenv ("COUNT2")) {
-                       cfg->globalra = TRUE;
-                       if (count == atoi (g_getenv ("COUNT2")))
-                               printf ("LAST: %s\n", mono_method_full_name (cfg->method, TRUE));
-                       if (count > atoi (g_getenv ("COUNT2")))
-                               cfg->globalra = FALSE;
-               }
-               */
-       }
-
-       if (header->clauses)
-               cfg->globalra = FALSE;
-
-       if (cfg->method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED)
-               /* The code in the prolog clobbers caller saved registers */
-               cfg->globalra = FALSE;
-
-       // FIXME: Disable globalra in case of tracing/profiling
-
-       if (cfg->method->save_lmf)
-               /* The LMF saving code might clobber caller saved registers */
-               cfg->globalra = FALSE;
-
-       if (header->code_size > 5000)
-               // FIXME:
-               /* Too large bblocks could overflow the ins positions */
-               cfg->globalra = FALSE;
-
-       cfg->rs = mono_regstate_new ();
-       if (cfg->globalra)
-               cfg->rs->next_vreg = MONO_MAX_IREGS + MONO_MAX_FREGS;
-       cfg->next_vreg = cfg->rs->next_vreg;
-
-       /* FIXME: Fix SSA to handle branches inside bblocks */
-       if (cfg->opt & MONO_OPT_SSA)
-               cfg->enable_extended_bblocks = FALSE;
-
-       /*
-        * FIXME: This confuses liveness analysis because variables which are assigned after
-        * a branch inside a bblock become part of the kill set, even though the assignment
-        * might not get executed. This causes the optimize_initlocals pass to delete some
-        * assignments which are needed.
-        * Also, the mono_if_conversion pass needs to be modified to recognize the code
-        * created by this.
-        */
-       //cfg->enable_extended_bblocks = TRUE;
-
-       /*We must verify the method before doing any IR generation as mono_compile_create_vars can assert.*/
-       if (mono_compile_is_broken (cfg, cfg->method, TRUE)) {
-               if (mini_get_debug_options ()->break_on_unverified)
-                       G_BREAKPOINT ();
-               return cfg;
-       }
-
-       /*
-        * create MonoInst* which represents arguments and local variables
-        */
-       mono_compile_create_vars (cfg);
-
-       /* SSAPRE is not supported on linear IR */
-       cfg->opt &= ~MONO_OPT_SSAPRE;
-
-       i = mono_method_to_ir (cfg, method_to_compile, NULL, NULL, NULL, NULL, 0, FALSE);
-
-       if (i < 0) {
-               if (try_generic_shared && cfg->exception_type == MONO_EXCEPTION_GENERIC_SHARING_FAILED) {
-                       if (compile_aot) {
-                               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
-                               return cfg;
-                       }
-                       mono_destroy_compile (cfg);
-                       try_generic_shared = FALSE;
-                       goto restart_compile;
-               }
-               g_assert (cfg->exception_type != MONO_EXCEPTION_GENERIC_SHARING_FAILED);
-
-               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
-               /* cfg contains the details of the failure, so let the caller cleanup */
-               return cfg;
-       }
-
-       cfg->stat_basic_blocks += cfg->num_bblocks;
-
-       if (COMPILE_LLVM (cfg)) {
-               MonoInst *ins;
-
-               /* The IR has to be in SSA form for LLVM */
-               cfg->opt |= MONO_OPT_SSA;
-
-               // FIXME:
-               if (cfg->ret) {
-                       // Allow SSA on the result value
-                       cfg->ret->flags &= ~MONO_INST_VOLATILE;
-
-                       // Add an explicit return instruction referencing the return value
-                       MONO_INST_NEW (cfg, ins, OP_SETRET);
-                       ins->sreg1 = cfg->ret->dreg;
-
-                       MONO_ADD_INS (cfg->bb_exit, ins);
-               }
-
-               cfg->opt &= ~MONO_OPT_LINEARS;
-
-               /* FIXME: */
-               cfg->opt &= ~MONO_OPT_BRANCH;
-       }
-
-       /* todo: remove code when we have verified that the liveness for try/catch blocks
-        * works perfectly 
-        */
-       /* 
-        * Currently, this can't be commented out since exception blocks are not
-        * processed during liveness analysis.
-        * It is also needed, because otherwise the local optimization passes would
-        * delete assignments in cases like this:
-        * r1 <- 1
-        * <something which throws>
-        * r1 <- 2
-        * This also allows SSA to be run on methods containing exception clauses, since
-        * SSA will ignore variables marked VOLATILE.
-        */
-       mono_liveness_handle_exception_clauses (cfg);
-
-       mono_handle_out_of_line_bblock (cfg);
-
-       /*g_print ("numblocks = %d\n", cfg->num_bblocks);*/
-
-       if (!COMPILE_LLVM (cfg))
-               mono_decompose_long_opts (cfg);
-
-       /* Should be done before branch opts */
-       if (cfg->opt & (MONO_OPT_CONSPROP | MONO_OPT_COPYPROP))
-               mono_local_cprop (cfg);
-
-       if (cfg->opt & MONO_OPT_BRANCH)
-               mono_optimize_branches (cfg);
-
-       /* This must be done _before_ global reg alloc and _after_ decompose */
-       mono_handle_global_vregs (cfg);
-       if (cfg->opt & MONO_OPT_DEADCE)
-               mono_local_deadce (cfg);
-       if (cfg->opt & MONO_OPT_ALIAS_ANALYSIS)
-               mono_local_alias_analysis (cfg);
-       /* Disable this for LLVM to make the IR easier to handle */
-       if (!COMPILE_LLVM (cfg))
-               mono_if_conversion (cfg);
-
-       if ((cfg->opt & MONO_OPT_SSAPRE) || cfg->globalra)
-               mono_remove_critical_edges (cfg);
-
-       /* Depth-first ordering on basic blocks */
-       cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
-
-       cfg->max_block_num = cfg->num_bblocks;
-
-       dfn = 0;
-       df_visit (cfg->bb_entry, &dfn, cfg->bblocks);
-       if (cfg->num_bblocks != dfn + 1) {
-               MonoBasicBlock *bb;
-
-               cfg->num_bblocks = dfn + 1;
-
-               /* remove unreachable code, because the code in them may be 
-                * inconsistent  (access to dead variables for example) */
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
-                       bb->flags &= ~BB_VISITED;
-               compute_reachable (cfg->bb_entry);
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
-                       if (bb->flags & BB_EXCEPTION_HANDLER)
-                               compute_reachable (bb);
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-                       if (!(bb->flags & BB_VISITED)) {
-                               if (cfg->verbose_level > 1)
-                                       g_print ("found unreachable code in BB%d\n", bb->block_num);
-                               bb->code = bb->last_ins = NULL;
-                               while (bb->out_count)
-                                       mono_unlink_bblock (cfg, bb, bb->out_bb [0]);
-                       }
-               }
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
-                       bb->flags &= ~BB_VISITED;
-       }
-
-       if (((cfg->num_varinfo > 2000) || (cfg->num_bblocks > 1000)) && !cfg->compile_aot) {
-               /* 
-                * we disable some optimizations if there are too many variables
-                * because JIT time may become too expensive. The actual number needs 
-                * to be tweaked and eventually the non-linear algorithms should be fixed.
-                */
-               cfg->opt &= ~ (MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP);
-               cfg->disable_ssa = TRUE;
-       }
-
-       if (cfg->opt & MONO_OPT_LOOP) {
-               mono_compile_dominator_info (cfg, MONO_COMP_DOM | MONO_COMP_IDOM);
-               mono_compute_natural_loops (cfg);
-       }
-
-       /* after method_to_ir */
-       if (parts == 1) {
-               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
-               return cfg;
-       }
-
-       /*
-         if (header->num_clauses)
-         cfg->disable_ssa = TRUE;
-       */
-
-//#define DEBUGSSA "logic_run"
-//#define DEBUGSSA_CLASS "Tests"
-#ifdef DEBUGSSA
-
-       if (!cfg->disable_ssa) {
-               mono_local_cprop (cfg);
-
-#ifndef DISABLE_SSA
-               mono_ssa_compute (cfg);
-#endif
-       }
-#else 
-       if (cfg->opt & MONO_OPT_SSA) {
-               if (!(cfg->comp_done & MONO_COMP_SSA) && !cfg->disable_ssa) {
-#ifndef DISABLE_SSA
-                       mono_ssa_compute (cfg);
-#endif
-
-                       if (cfg->verbose_level >= 2) {
-                               print_dfn (cfg);
-                       }
-               }
-       }
-#endif
-
-       /* after SSA translation */
-       if (parts == 2) {
-               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
-               return cfg;
-       }
-
-       if ((cfg->opt & MONO_OPT_CONSPROP) || (cfg->opt & MONO_OPT_COPYPROP)) {
-               if (cfg->comp_done & MONO_COMP_SSA && !COMPILE_LLVM (cfg)) {
-#ifndef DISABLE_SSA
-                       mono_ssa_cprop (cfg);
-#endif
-               }
-       }
-
-#ifndef DISABLE_SSA
-       if (cfg->comp_done & MONO_COMP_SSA && !COMPILE_LLVM (cfg)) {
-               //mono_ssa_strength_reduction (cfg);
-
-               if (cfg->opt & MONO_OPT_SSAPRE) {
-                       mono_perform_ssapre (cfg);
-                       //mono_local_cprop (cfg);
-               }
-
-               if (cfg->opt & MONO_OPT_DEADCE) {
-                       mono_ssa_deadce (cfg);
-                       deadce_has_run = TRUE;
-               }
-
-               if ((cfg->flags & (MONO_CFG_HAS_LDELEMA|MONO_CFG_HAS_CHECK_THIS)) && (cfg->opt & MONO_OPT_ABCREM))
-                       mono_perform_abc_removal (cfg);
-
-               mono_ssa_remove (cfg);
-               mono_local_cprop (cfg);
-               mono_handle_global_vregs (cfg);
-               if (cfg->opt & MONO_OPT_DEADCE)
-                       mono_local_deadce (cfg);
-
-               if (cfg->opt & MONO_OPT_BRANCH) {
-                       MonoBasicBlock *bb;
-
-                       mono_optimize_branches (cfg);
-
-                       /* Have to recompute cfg->bblocks and bb->dfn */
-                       if (cfg->globalra) {
-                               mono_remove_critical_edges (cfg);
-
-                               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
-                                       bb->dfn = 0;
-
-                               /* Depth-first ordering on basic blocks */
-                               cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
-
-                               dfn = 0;
-                               df_visit (cfg->bb_entry, &dfn, cfg->bblocks);
-                               cfg->num_bblocks = dfn + 1;
-                       }
-               }
-       }
-#endif
-
-       if (cfg->comp_done & MONO_COMP_SSA && COMPILE_LLVM (cfg)) {
-               mono_ssa_loop_invariant_code_motion (cfg);
-               /* This removes MONO_INST_FAULT flags too so perform it unconditionally */
-               if (cfg->opt & MONO_OPT_ABCREM)
-                       mono_perform_abc_removal (cfg);
-       }
-
-       /* after SSA removal */
-       if (parts == 3) {
-               if (MONO_METHOD_COMPILE_END_ENABLED ())
-                       MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
-               return cfg;
-       }
-
-#ifdef MONO_ARCH_SOFT_FLOAT_FALLBACK
-       if (COMPILE_SOFT_FLOAT (cfg))
-               mono_decompose_soft_float (cfg);
-#endif
-       if (COMPILE_LLVM (cfg))
-               mono_decompose_vtype_opts_llvm (cfg);
-       else
-               mono_decompose_vtype_opts (cfg);
-       if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
-               mono_decompose_array_access_opts (cfg);
-
-       if (cfg->got_var) {
-#ifndef MONO_ARCH_GOT_REG
-               GList *regs;
-#endif
-               int got_reg;
-
-               g_assert (cfg->got_var_allocated);
-
-               /* 
-                * Allways allocate the GOT var to a register, because keeping it
-                * in memory will increase the number of live temporaries in some
-                * code created by inssel.brg, leading to the well known spills+
-                * branches problem. Testcase: mcs crash in 
-                * System.MonoCustomAttrs:GetCustomAttributes.
-                */
-#ifdef MONO_ARCH_GOT_REG
-               got_reg = MONO_ARCH_GOT_REG;
-#else
-               regs = mono_arch_get_global_int_regs (cfg);
-               g_assert (regs);
-               got_reg = GPOINTER_TO_INT (regs->data);
-               g_list_free (regs);
-#endif
-               cfg->got_var->opcode = OP_REGVAR;
-               cfg->got_var->dreg = got_reg;
-               cfg->used_int_regs |= 1LL << cfg->got_var->dreg;
-       }
-
-       /*
-        * Have to call this again to process variables added since the first call.
-        */
-       mono_liveness_handle_exception_clauses (cfg);
-
-       if (cfg->globalra) {
-               MonoBasicBlock *bb;
-
-               /* Have to do this before regalloc since it can create vregs */
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
-                       mono_arch_lowering_pass (cfg, bb);
-
-               mono_global_regalloc (cfg);
-       }
-
-       if ((cfg->opt & MONO_OPT_LINEARS) && !cfg->globalra) {
-               GList *vars, *regs, *l;
-               
-               /* fixme: maybe we can avoid to compute livenesss here if already computed ? */
-               cfg->comp_done &= ~MONO_COMP_LIVENESS;
-               if (!(cfg->comp_done & MONO_COMP_LIVENESS))
-                       mono_analyze_liveness (cfg);
-
-               if ((vars = mono_arch_get_allocatable_int_vars (cfg))) {
-                       regs = mono_arch_get_global_int_regs (cfg);
-                       /* Remove the reg reserved for holding the GOT address */
-                       if (cfg->got_var) {
-                               for (l = regs; l; l = l->next) {
-                                       if (GPOINTER_TO_UINT (l->data) == cfg->got_var->dreg) {
-                                               regs = g_list_delete_link (regs, l);
-                                               break;
-                                       }
-                               }
-                       }
-                       mono_linear_scan (cfg, vars, regs, &cfg->used_int_regs);
-               }
-       }
-
-       //mono_print_code (cfg, "");
-
-    //print_dfn (cfg);
-       
-       /* variables are allocated after decompose, since decompose could create temps */
-       if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
-               mono_arch_allocate_vars (cfg);
-               if (cfg->exception_type)
-                       return cfg;
-       }
-
-       {
-               MonoBasicBlock *bb;
-               gboolean need_local_opts;
-
-               if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
-                       mono_spill_global_vars (cfg, &need_local_opts);
-
-                       if (need_local_opts || cfg->compile_aot) {
-                               /* To optimize code created by spill_global_vars */
-                               mono_local_cprop (cfg);
-                               if (cfg->opt & MONO_OPT_DEADCE)
-                                       mono_local_deadce (cfg);
-                       }
-               }
-
-               /* Add branches between non-consecutive bblocks */
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-                       if (bb->last_ins && MONO_IS_COND_BRANCH_OP (bb->last_ins) &&
-                               bb->last_ins->inst_false_bb && bb->next_bb != bb->last_ins->inst_false_bb) {
-                               /* we are careful when inverting, since bugs like #59580
-                                * could show up when dealing with NaNs.
-                                */
-                               if (MONO_IS_COND_BRANCH_NOFP(bb->last_ins) && bb->next_bb == bb->last_ins->inst_true_bb) {
-                                       MonoBasicBlock *tmp =  bb->last_ins->inst_true_bb;
-                                       bb->last_ins->inst_true_bb = bb->last_ins->inst_false_bb;
-                                       bb->last_ins->inst_false_bb = tmp;
-
-                                       bb->last_ins->opcode = mono_reverse_branch_op (bb->last_ins->opcode);
-                               } else {                        
-                                       MonoInst *inst = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));
-                                       inst->opcode = OP_BR;
-                                       inst->inst_target_bb = bb->last_ins->inst_false_bb;
-                                       mono_bblock_add_inst (bb, inst);
-                               }
-                       }
-               }
-
-               if (cfg->verbose_level >= 4 && !cfg->globalra) {
-                       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-                               MonoInst *tree = bb->code;      
-                               g_print ("DUMP BLOCK %d:\n", bb->block_num);
-                               if (!tree)
-                                       continue;
-                               for (; tree; tree = tree->next) {
-                                       mono_print_ins_index (-1, tree);
-                               }
-                       }
-               }
-
-               /* FIXME: */
-               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
-                       bb->max_vreg = cfg->next_vreg;
-               }
-       }
-
-       if (COMPILE_LLVM (cfg)) {
-#ifdef ENABLE_LLVM
-               char *nm;
-
-               /* The IR has to be in SSA form for LLVM */
-               if (!(cfg->comp_done & MONO_COMP_SSA)) {
-                       cfg->exception_message = g_strdup ("SSA disabled.");
-                       cfg->disable_llvm = TRUE;
-               }
-
-               if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
-                       mono_decompose_array_access_opts (cfg);
-
-               if (!cfg->disable_llvm)
-                       mono_llvm_emit_method (cfg);
-               if (cfg->disable_llvm) {
-                       if (cfg->verbose_level >= 1) {
-                               //nm = mono_method_full_name (cfg->method, TRUE);
-                               printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
-                               //g_free (nm);
-                       }
-                       mono_destroy_compile (cfg);
-                       try_llvm = FALSE;
-                       goto restart_compile;
-               }
-
-               if (cfg->verbose_level > 0 && !cfg->compile_aot) {
-                       nm = mono_method_full_name (cfg->method, TRUE);
-                       g_print ("LLVM Method %s emitted at %p to %p (code length %d) [%s]\n", 
-                                        nm, 
-                                        cfg->native_code, cfg->native_code + cfg->code_len, cfg->code_len, cfg->domain->friendly_name);
-                       g_free (nm);
-               }
-#endif
-       } else {
-               mono_codegen (cfg);
-       }
-
-       if (COMPILE_LLVM (cfg))
-               InterlockedIncrement (&mono_jit_stats.methods_with_llvm);
-       else
-               InterlockedIncrement (&mono_jit_stats.methods_without_llvm);
-
-       cfg->jit_info = create_jit_info (cfg, method_to_compile);
-
-#ifdef MONO_ARCH_HAVE_LIVERANGE_OPS
-       if (cfg->extend_live_ranges) {
-               /* Extend live ranges to cover the whole method */
-               for (i = 0; i < cfg->num_varinfo; ++i)
-                       MONO_VARINFO (cfg, i)->live_range_end = cfg->code_len;
-       }
-#endif
-
-       if (!cfg->compile_aot)
-               mono_save_xdebug_info (cfg);
-
-       mini_gc_create_gc_map (cfg);
-       mono_save_seq_point_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) {
-               mono_domain_lock (cfg->domain);
-               mono_jit_info_table_add (cfg->domain, cfg->jit_info);
-
-               if (cfg->method->dynamic)
-                       mono_dynamic_code_hash_lookup (cfg->domain, cfg->method)->ji = cfg->jit_info;
-               mono_domain_unlock (cfg->domain);
-       }
-
-#if 0
-       if (cfg->gsharedvt)
-               printf ("GSHAREDVT: %s\n", mono_method_full_name (cfg->method, TRUE));
-#endif
-
-       /* collect statistics */
-#ifndef DISABLE_PERFCOUNTERS
-       mono_perfcounters->jit_methods++;
-       mono_perfcounters->jit_bytes += header->code_size;
-#endif
-       mono_jit_stats.allocated_code_size += cfg->code_len;
-       code_size_ratio = cfg->code_len;
-       if (code_size_ratio > mono_jit_stats.biggest_method_size && mono_jit_stats.enabled) {
-               mono_jit_stats.biggest_method_size = code_size_ratio;
-               g_free (mono_jit_stats.biggest_method);
-               mono_jit_stats.biggest_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
-       }
-       code_size_ratio = (code_size_ratio * 100) / header->code_size;
-       if (code_size_ratio > mono_jit_stats.max_code_size_ratio && mono_jit_stats.enabled) {
-               mono_jit_stats.max_code_size_ratio = code_size_ratio;
-               g_free (mono_jit_stats.max_ratio_method);
-               mono_jit_stats.max_ratio_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
-       }
-       mono_jit_stats.native_code_size += cfg->code_len;
-
-       if (MONO_METHOD_COMPILE_END_ENABLED ())
-               MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
-
-       return cfg;
-}
-
-#else
-
-MonoCompile*
-mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFlags flags, int parts)
-{
-       g_assert_not_reached ();
-       return NULL;
-}
-
-#endif /* DISABLE_JIT */
-
-/*
- * LOCKING: Acquires the jit code hash lock.
- */
-static MonoJitInfo*
-lookup_method_inner (MonoDomain *domain, MonoMethod *method, MonoMethod *shared)
-{
-       MonoJitInfo *ji;
-       static gboolean inited = FALSE;
-       static int lookups = 0;
-       static int failed_lookups = 0;
-
-       mono_domain_jit_code_hash_lock (domain);
-       ji = mono_internal_hash_table_lookup (&domain->jit_code_hash, method);
-       if (!ji && shared) {
-               /* Try generic sharing */
-               ji = mono_internal_hash_table_lookup (&domain->jit_code_hash, shared);
-               if (ji && !ji->has_generic_jit_info)
-                       ji = NULL;
-               if (!inited) {
-                       mono_counters_register ("Shared generic lookups", MONO_COUNTER_INT|MONO_COUNTER_GENERICS, &lookups);
-                       mono_counters_register ("Failed shared generic lookups", MONO_COUNTER_INT|MONO_COUNTER_GENERICS, &failed_lookups);
-                       inited = TRUE;
-               }
-
-               ++lookups;
-               if (!ji)
-                       ++failed_lookups;
-       }
-       mono_domain_jit_code_hash_unlock (domain);
-
-       return ji;
-}
-
-static MonoJitInfo*
-lookup_method (MonoDomain *domain, MonoMethod *method)
-{
-       MonoJitInfo *ji;
-       MonoMethod *shared;
-
-       ji = lookup_method_inner (domain, method, NULL);
-
-       if (!ji) {
-               if (!mono_method_is_generic_sharable (method, FALSE))
-                       return NULL;
-               shared = mini_get_shared_method (method);
-               ji = lookup_method_inner (domain, method, shared);
-       }
-
-       return ji;
-}
-
-#if ENABLE_JIT_MAP
-static FILE* perf_map_file;
-
-void
-mono_enable_jit_map (void)
-{
-       if (!perf_map_file) {
-               char name [64];
-               g_snprintf (name, sizeof (name), "/tmp/perf-%d.map", getpid ());
-               unlink (name);
-               perf_map_file = fopen (name, "w");
-       }
-}
-
-void
-mono_emit_jit_tramp (void *start, int size, const char *desc)
-{
-       if (perf_map_file)
-               fprintf (perf_map_file, "%llx %x %s\n", (long long unsigned int)(gsize)start, size, desc);
-}
-
-void
-mono_emit_jit_map (MonoJitInfo *jinfo)
-{
-       if (perf_map_file) {
-               char *name = mono_method_full_name (jinfo_get_method (jinfo), TRUE);
-               mono_emit_jit_tramp (jinfo->code_start, jinfo->code_size, name);
-               g_free (name);
-       }
-}
-
-gboolean
-mono_jit_map_is_enabled (void)
-{
-       return perf_map_file != NULL;
-}
-
-#endif
-
-static gpointer
-mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, int opt, MonoException **jit_ex)
-{
-       MonoCompile *cfg;
-       gpointer code = NULL;
-       MonoJitInfo *jinfo, *info;
-       MonoVTable *vtable;
-       MonoException *ex = NULL;
-       guint32 prof_options;
-       GTimer *jit_timer;
-       MonoMethod *prof_method, *shared;
-
-#ifdef MONO_USE_AOT_COMPILER
-       if (opt & MONO_OPT_AOT) {
-               MonoDomain *domain = mono_domain_get ();
-
-               mono_class_init (method->klass);
-
-               if ((code = mono_aot_get_method (domain, method))) {
-                       vtable = mono_class_vtable (domain, method->klass);
-                       g_assert (vtable);
-                       mono_runtime_class_init (vtable);
-
-                       return code;
-               }
-       }
-#endif
-
-       if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
-           (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
-               MonoMethod *nm;
-               MonoMethodPInvoke* piinfo = (MonoMethodPInvoke *) method;
-
-               if (!piinfo->addr) {
-                       if (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
-                               piinfo->addr = mono_lookup_internal_call (method);
-                       else if (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)
-#ifdef HOST_WIN32
-                               g_warning ("Method '%s' in assembly '%s' contains native code that cannot be executed by Mono in modules loaded from byte arrays. The assembly was probably created using C++/CLI.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
-#else
-                               g_warning ("Method '%s' in assembly '%s' contains native code that cannot be executed by Mono on this platform. The assembly was probably created using C++/CLI.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
-#endif
-                       else
-                               mono_lookup_pinvoke_call (method, NULL, NULL);
-               }
-               nm = mono_marshal_get_native_wrapper (method, check_for_pending_exc, mono_aot_only);
-               code = mono_get_addr_from_ftnptr (mono_compile_method (nm));
-               jinfo = mono_jit_info_table_find (target_domain, code);
-               if (!jinfo)
-                       jinfo = mono_jit_info_table_find (mono_domain_get (), code);
-               if (jinfo)
-                       mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
-               return code;
-       } else if ((method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
-               const char *name = method->name;
-               char *full_name, *msg;
-               MonoMethod *nm;
-
-               if (method->klass->parent == mono_defaults.multicastdelegate_class) {
-                       if (*name == '.' && (strcmp (name, ".ctor") == 0)) {
-                               MonoJitICallInfo *mi = mono_find_jit_icall_by_name ("mono_delegate_ctor");
-                               g_assert (mi);
-                               /*
-                                * We need to make sure this wrapper
-                                * is compiled because it might end up
-                                * in an (M)RGCTX if generic sharing
-                                * is enabled, and would be called
-                                * indirectly.  If it were a
-                                * trampoline we'd try to patch that
-                                * indirect call, which is not
-                                * possible.
-                                */
-                               return mono_get_addr_from_ftnptr ((gpointer)mono_icall_get_wrapper_full (mi, TRUE));
-                       } else if (*name == 'I' && (strcmp (name, "Invoke") == 0)) {
-#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
-                               return mono_create_delegate_trampoline (target_domain, method->klass);
-#else
-                               nm = mono_marshal_get_delegate_invoke (method, NULL);
-                               return mono_get_addr_from_ftnptr (mono_compile_method (nm));
-#endif
-                       } else if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0)) {
-                               nm = mono_marshal_get_delegate_begin_invoke (method);
-                               return mono_get_addr_from_ftnptr (mono_compile_method (nm));
-                       } else if (*name == 'E' && (strcmp (name, "EndInvoke") == 0)) {
-                               nm = mono_marshal_get_delegate_end_invoke (method);
-                               return mono_get_addr_from_ftnptr (mono_compile_method (nm));
-                       }
-               }
-
-               full_name = mono_method_full_name (method, TRUE);
-               msg = g_strdup_printf ("Unrecognizable runtime implemented method '%s'", full_name);
-               *jit_ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "InvalidProgramException", msg);
-               g_free (full_name);
-               g_free (msg);
-               return NULL;
-       }
-
-       if (method->wrapper_type == MONO_WRAPPER_UNKNOWN) {
-               WrapperInfo *info = mono_marshal_get_wrapper_info (method);
-
-               if (info->subtype == WRAPPER_SUBTYPE_GSHAREDVT_IN || info->subtype == WRAPPER_SUBTYPE_GSHAREDVT_OUT) {
-                       static MonoTrampInfo *in_tinfo, *out_tinfo;
-                       MonoTrampInfo *tinfo;
-                       MonoJitInfo *jinfo;
-                       gboolean is_in = info->subtype == WRAPPER_SUBTYPE_GSHAREDVT_IN;
-
-                       if (is_in && in_tinfo)
-                               return in_tinfo->code;
-                       else if (!is_in && out_tinfo)
-                               return out_tinfo->code;
-
-                       /*
-                        * This is a special wrapper whose body is implemented in assembly, like a trampoline. We use a wrapper so EH
-                        * works.
-                        * FIXME: The caller signature doesn't match the callee, which might cause problems on some platforms
-                        */
-                       if (mono_aot_only)
-                               mono_aot_get_trampoline_full (is_in ? "gsharedvt_trampoline" : "gsharedvt_out_trampoline", &tinfo);
-                       else
-                               mono_arch_get_gsharedvt_trampoline (&tinfo, FALSE);
-                       jinfo = create_jit_info_for_trampoline (method, tinfo);
-                       mono_jit_info_table_add (mono_get_root_domain (), jinfo);
-                       if (is_in)
-                               in_tinfo = tinfo;
-                       else
-                               out_tinfo = tinfo;
-                       return tinfo->code;
-               }
-       }
-
-       if (mono_aot_only) {
-               char *fullname = mono_method_full_name (method, TRUE);
-               char *msg = g_strdup_printf ("Attempting to JIT compile method '%s' while running with --aot-only. See http://docs.xamarin.com/ios/about/limitations for more information.\n", fullname);
-
-               *jit_ex = mono_get_exception_execution_engine (msg);
-               g_free (fullname);
-               g_free (msg);
-               
-               return NULL;
-       }
-
-       jit_timer = g_timer_new ();
-
-       cfg = mini_method_compile (method, opt, target_domain, JIT_FLAG_RUN_CCTORS, 0);
-       prof_method = cfg->method;
-
-       g_timer_stop (jit_timer);
-       mono_jit_stats.jit_time += g_timer_elapsed (jit_timer, NULL);
-       g_timer_destroy (jit_timer);
-
-       switch (cfg->exception_type) {
-       case MONO_EXCEPTION_NONE:
-               break;
-       case MONO_EXCEPTION_TYPE_LOAD:
-       case MONO_EXCEPTION_MISSING_FIELD:
-       case MONO_EXCEPTION_MISSING_METHOD:
-       case MONO_EXCEPTION_FILE_NOT_FOUND:
-       case MONO_EXCEPTION_BAD_IMAGE: {
-               /* Throw a type load exception if needed */
-               MonoLoaderError *error = mono_loader_get_last_error ();
-
-               if (error) {
-                       ex = mono_loader_error_prepare_exception (error);
-               } else {
-                       if (cfg->exception_ptr) {
-                               ex = mono_class_get_exception_for_failure (cfg->exception_ptr);
-                       } else {
-                               if (cfg->exception_type == MONO_EXCEPTION_MISSING_FIELD)
-                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingFieldException", cfg->exception_message);
-                               else if (cfg->exception_type == MONO_EXCEPTION_MISSING_METHOD)
-                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingMethodException", cfg->exception_message);
-                               else if (cfg->exception_type == MONO_EXCEPTION_TYPE_LOAD)
-                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "TypeLoadException", cfg->exception_message);
-                               else if (cfg->exception_type == MONO_EXCEPTION_FILE_NOT_FOUND)
-                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FileNotFoundException", cfg->exception_message);
-                               else if (cfg->exception_type == MONO_EXCEPTION_BAD_IMAGE)
-                                       ex = mono_get_exception_bad_image_format (cfg->exception_message);
-                               else
-                                       g_assert_not_reached ();
-                       }
-               }
-               break;
-       }
-       case MONO_EXCEPTION_INVALID_PROGRAM:
-               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "InvalidProgramException", cfg->exception_message);
-               break;
-       case MONO_EXCEPTION_UNVERIFIABLE_IL:
-               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System.Security", "VerificationException", cfg->exception_message);
-               break;
-       case MONO_EXCEPTION_METHOD_ACCESS:
-               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MethodAccessException", cfg->exception_message);
-               break;
-       case MONO_EXCEPTION_FIELD_ACCESS:
-               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FieldAccessException", cfg->exception_message);
-               break;
-#ifndef DISABLE_SECURITY
-       /* this can only be set if the security manager is active */
-       case MONO_EXCEPTION_SECURITY_LINKDEMAND: {
-               MonoSecurityManager* secman = mono_security_manager_get_methods ();
-               MonoObject *exc = NULL;
-               gpointer args [2];
-
-               args [0] = &cfg->exception_data;
-               args [1] = &method;
-               mono_runtime_invoke (secman->linkdemandsecurityexception, NULL, args, &exc);
-
-               ex = (MonoException*)exc;
-               break;
-       }
-#endif
-       case MONO_EXCEPTION_OBJECT_SUPPLIED: {
-               MonoException *exp = cfg->exception_ptr;
-               MONO_GC_UNREGISTER_ROOT (cfg->exception_ptr);
-
-               ex = exp;
-               break;
-       }
-       case MONO_EXCEPTION_OUT_OF_MEMORY:
-               ex = mono_domain_get ()->out_of_memory_ex;
-               break;
-       case MONO_EXCEPTION_MONO_ERROR:
-               g_assert (!mono_error_ok (&cfg->error));
-               ex = mono_error_convert_to_exception (&cfg->error);
-               break;
-       default:
-               g_assert_not_reached ();
-       }
-
-       if (ex) {
-               if (cfg->prof_options & MONO_PROFILE_JIT_COMPILATION)
-                       mono_profiler_method_end_jit (method, NULL, MONO_PROFILE_FAILED);
-
-               mono_destroy_compile (cfg);
-               *jit_ex = ex;
-
-               return NULL;
-       }
-
-       if (mono_method_is_generic_sharable (method, FALSE))
-               shared = mini_get_shared_method (method);
-       else
-               shared = NULL;
-
-       mono_domain_lock (target_domain);
-
-       /* Check if some other thread already did the job. In this case, we can
-       discard the code this thread generated. */
-
-       info = lookup_method_inner (target_domain, method, shared);
-       if (info) {
-               /* We can't use a domain specific method in another domain */
-               if ((target_domain == mono_domain_get ()) || info->domain_neutral) {
-                       code = info->code_start;
-//                     printf("Discarding code for method %s\n", method->name);
-               }
-       }
-       if (code == NULL) {
-               /* The lookup + insert is atomic since this is done inside the domain lock */
-               mono_domain_jit_code_hash_lock (target_domain);
-               mono_internal_hash_table_insert (&target_domain->jit_code_hash, cfg->jit_info->d.method, cfg->jit_info);
-               mono_domain_jit_code_hash_unlock (target_domain);
-
-               code = cfg->native_code;
-
-               if (cfg->generic_sharing_context && mono_method_is_generic_sharable (method, FALSE))
-                       mono_stats.generics_shared_methods++;
-               if (cfg->gsharedvt)
-                       mono_stats.gsharedvt_methods++;
-       }
-
-       jinfo = cfg->jit_info;
-
-       prof_options = cfg->prof_options;
-
-       /*
-        * Update global stats while holding a lock, instead of doing many
-        * InterlockedIncrement operations during JITting.
-        */
-       mono_jit_stats.allocate_var += cfg->stat_allocate_var;
-       mono_jit_stats.locals_stack_size += cfg->stat_locals_stack_size;
-       mono_jit_stats.basic_blocks += cfg->stat_basic_blocks;
-       mono_jit_stats.max_basic_blocks = MAX (cfg->stat_basic_blocks, mono_jit_stats.max_basic_blocks);
-       mono_jit_stats.cil_code_size += cfg->stat_cil_code_size;
-       mono_jit_stats.regvars += cfg->stat_n_regvars;
-       mono_jit_stats.inlineable_methods += cfg->stat_inlineable_methods;
-       mono_jit_stats.inlined_methods += cfg->stat_inlined_methods;
-       mono_jit_stats.cas_demand_generation += cfg->stat_cas_demand_generation;
-       mono_jit_stats.code_reallocs += cfg->stat_code_reallocs;
-
-       mono_destroy_compile (cfg);
-
-#ifndef DISABLE_JIT
-       if (domain_jit_info (target_domain)->jump_target_hash) {
-               MonoJumpInfo patch_info;
-               MonoJumpList *jlist;
-               GSList *tmp;
-               jlist = g_hash_table_lookup (domain_jit_info (target_domain)->jump_target_hash, method);
-               if (jlist) {
-                       patch_info.next = NULL;
-                       patch_info.ip.i = 0;
-                       patch_info.type = MONO_PATCH_INFO_METHOD_JUMP;
-                       patch_info.data.method = method;
-                       g_hash_table_remove (domain_jit_info (target_domain)->jump_target_hash, method);
-
-#if defined(__native_client_codegen__) && defined(__native_client__)
-                       /* These patches are applied after a method has been installed, no target munging is needed. */
-                       nacl_allow_target_modification (FALSE);
-#endif
-                       for (tmp = jlist->list; tmp; tmp = tmp->next)
-                               mono_arch_patch_code (NULL, target_domain, tmp->data, &patch_info, NULL, TRUE);
-#if defined(__native_client_codegen__) && defined(__native_client__)
-                       nacl_allow_target_modification (TRUE);
-#endif
-               }
-       }
-
-       mono_emit_jit_map (jinfo);
-#endif
-       mono_domain_unlock (target_domain);
-
-       vtable = mono_class_vtable (target_domain, method->klass);
-       if (!vtable) {
-               ex = mono_class_get_exception_for_failure (method->klass);
-               g_assert (ex);
-               *jit_ex = ex;
-               return NULL;
-       }
-
-       if (prof_options & MONO_PROFILE_JIT_COMPILATION) {
-               if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE) {
-                       if (mono_marshal_method_from_wrapper (method)) {
-                               /* Native func wrappers have no method */
-                               /* The profiler doesn't know about wrappers, so pass the original icall method */
-                               mono_profiler_method_end_jit (mono_marshal_method_from_wrapper (method), jinfo, MONO_PROFILE_OK);
-                       }
-               }
-               mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
-               if (prof_method != method) {
-                       mono_profiler_method_end_jit (prof_method, jinfo, MONO_PROFILE_OK);
-               }
-       }
-
-       ex = mono_runtime_class_init_full (vtable, FALSE);
-       if (ex) {
-               *jit_ex = ex;
-               return NULL;
-       }
-       return code;
-}
+                       ei->flags = ec->flags;
 
-static gpointer
-mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoException **ex)
-{
-       MonoDomain *target_domain, *domain = mono_domain_get ();
-       MonoJitInfo *info;
-       gpointer code, p;
-       MonoJitInfo *ji;
-       MonoJitICallInfo *callinfo = NULL;
-       WrapperInfo *winfo = NULL;
+                       if (G_UNLIKELY (cfg->verbose_level >= 4))
+                               printf ("IL clause: try 0x%x-0x%x handler 0x%x-0x%x filter 0x%x\n", ec->try_offset, ec->try_offset + ec->try_len, ec->handler_offset, ec->handler_offset + ec->handler_len, ec->flags == MONO_EXCEPTION_CLAUSE_FILTER ? ec->data.filter_offset : 0);
 
-       /*
-        * ICALL wrappers are handled specially, since there is only one copy of them
-        * shared by all appdomains.
-        */
-       if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE)
-               winfo = mono_marshal_get_wrapper_info (method);
-       if (winfo && winfo->subtype == WRAPPER_SUBTYPE_ICALL_WRAPPER) {
-               callinfo = mono_find_jit_icall_by_addr (winfo->d.icall.func);
-               g_assert (callinfo);
+                       /*
+                        * The spvars are needed by mono_arch_install_handler_block_guard ().
+                        */
+                       if (ei->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
+                               int region;
 
-               /* Must be domain neutral since there is only one copy */
-               opt |= MONO_OPT_SHARED;
-       }
+                               region = ((i + 1) << 8) | MONO_REGION_FINALLY | ec->flags;
+                               spvar = mono_find_spvar_for_region (cfg, region);
+                               g_assert (spvar);
+                               ei->exvar_offset = spvar->inst_offset;
+                       } else {
+                               exvar = mono_find_exvar_for_offset (cfg, ec->handler_offset);
+                               ei->exvar_offset = exvar ? exvar->inst_offset : 0;
+                       }
 
-       if (method->dynamic)
-               opt &= ~MONO_OPT_SHARED;
+                       if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
+                               tblock = cfg->cil_offset_to_bb [ec->data.filter_offset];
+                               g_assert (tblock);
+                               ei->data.filter = cfg->native_code + tblock->native_offset;
+                       } else {
+                               ei->data.catch_class = ec->data.catch_class;
+                       }
 
-       /* These methods can become invalid when a domain is unloaded */
-       if (method->klass->image != mono_get_corlib () || method->is_inflated)
-               opt &= ~MONO_OPT_SHARED;
+                       tblock = cfg->cil_offset_to_bb [ec->try_offset];
+                       g_assert (tblock);
+                       g_assert (tblock->native_offset);
+                       ei->try_start = cfg->native_code + tblock->native_offset;
+                       if (tblock->extend_try_block) {
+                               /*
+                                * Extend the try block backwards to include parts of the previous call
+                                * instruction.
+                                */
+                               ei->try_start = (guint8*)ei->try_start - MONO_ARCH_MONITOR_ENTER_ADJUSTMENT;
+                       }
+                       tblock = cfg->cil_offset_to_bb [ec->try_offset + ec->try_len];
+                       g_assert (tblock);
+                       if (!tblock->native_offset) {
+                               int j, end;
+                               for (j = ec->try_offset + ec->try_len, end = ec->try_offset; j >= end; --j) {
+                                       MonoBasicBlock *bb = cfg->cil_offset_to_bb [j];
+                                       if (bb && bb->native_offset) {
+                                               tblock = bb;
+                                               break;
+                                       }
+                               }
+                       }
+                       ei->try_end = cfg->native_code + tblock->native_offset;
+                       g_assert (tblock->native_offset);
+                       tblock = cfg->cil_offset_to_bb [ec->handler_offset];
+                       g_assert (tblock);
+                       ei->handler_start = cfg->native_code + tblock->native_offset;
 
-       if (opt & MONO_OPT_SHARED)
-               target_domain = mono_get_root_domain ();
-       else 
-               target_domain = domain;
+                       for (tmp = cfg->try_block_holes; tmp; tmp = tmp->next) {
+                               TryBlockHole *hole = tmp->data;
+                               gpointer hole_end = cfg->native_code + (hole->basic_block->native_offset + hole->basic_block->native_length);
+                               if (hole->clause == ec && hole_end == ei->try_end) {
+                                       if (G_UNLIKELY (cfg->verbose_level >= 4))
+                                               printf ("\tShortening try block %d from %x to %x\n", i, (int)((guint8*)ei->try_end - cfg->native_code), hole->start_offset);
 
-       if (method->wrapper_type == MONO_WRAPPER_UNKNOWN) {
-               WrapperInfo *info = mono_marshal_get_wrapper_info (method);
+                                       ei->try_end = cfg->native_code + hole->start_offset;
+                                       break;
+                               }
+                       }
+
+                       if (ec->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
+                               int end_offset;
+                               if (ec->handler_offset + ec->handler_len < header->code_size) {
+                                       tblock = cfg->cil_offset_to_bb [ec->handler_offset + ec->handler_len];
+                                       if (tblock->native_offset) {
+                                               end_offset = tblock->native_offset;
+                                       } else {
+                                               int j, end;
 
-               g_assert (info);
-               if (info->subtype == WRAPPER_SUBTYPE_SYNCHRONIZED_INNER) {
-                       MonoGenericContext *ctx = NULL;
-                       if (method->is_inflated)
-                               ctx = mono_method_get_context (method);
-                       method = info->d.synchronized_inner.method;
-                       if (ctx) {
-                               MonoError error;
-                               method = mono_class_inflate_generic_method_checked (method, ctx, &error);
-                               g_assert (mono_error_ok (&error)); /* FIXME don't swallow the error */
+                                               for (j = ec->handler_offset + ec->handler_len, end = ec->handler_offset; j >= end; --j) {
+                                                       MonoBasicBlock *bb = cfg->cil_offset_to_bb [j];
+                                                       if (bb && bb->native_offset) {
+                                                               tblock = bb;
+                                                               break;
+                                                       }
+                                               }
+                                               end_offset = tblock->native_offset +  tblock->native_length;
+                                       }
+                               } else {
+                                       end_offset = cfg->epilog_begin;
+                               }
+                               ei->data.handler_end = cfg->native_code + end_offset;
                        }
                }
        }
 
-       info = lookup_method (target_domain, method);
-       if (info) {
-               /* We can't use a domain specific method in another domain */
-               if (! ((domain != target_domain) && !info->domain_neutral)) {
-                       MonoVTable *vtable;
-                       MonoException *tmpEx;
-
-                       mono_jit_stats.methods_lookups++;
-                       vtable = mono_class_vtable (domain, method->klass);
-                       g_assert (vtable);
-                       tmpEx = mono_runtime_class_init_full (vtable, ex == NULL);
-                       if (tmpEx) {
-                               *ex = tmpEx;
-                               return NULL;
-                       }
-                       return mono_create_ftnptr (target_domain, info->code_start);
+       if (G_UNLIKELY (cfg->verbose_level >= 4)) {
+               int i;
+               for (i = 0; i < jinfo->num_clauses; i++) {
+                       MonoJitExceptionInfo *ei = &jinfo->clauses [i];
+                       int start = (guint8*)ei->try_start - cfg->native_code;
+                       int end = (guint8*)ei->try_end - cfg->native_code;
+                       int handler = (guint8*)ei->handler_start - cfg->native_code;
+                       int handler_end = (guint8*)ei->data.handler_end - cfg->native_code;
+
+                       printf ("JitInfo EH clause %d flags %x try %x-%x handler %x-%x\n", i, ei->flags, start, end, handler, handler_end);
                }
        }
 
-       code = mono_jit_compile_method_inner (method, target_domain, opt, ex);
-       if (!code)
-               return NULL;
-
-       if (method->wrapper_type == MONO_WRAPPER_WRITE_BARRIER || method->wrapper_type == MONO_WRAPPER_ALLOC) {
-               MonoDomain *d;
+       if (cfg->encoded_unwind_ops) {
+               /* Generated by LLVM */
+               jinfo->unwind_info = mono_cache_unwind_info (cfg->encoded_unwind_ops, cfg->encoded_unwind_ops_len);
+               g_free (cfg->encoded_unwind_ops);
+       } else if (cfg->unwind_ops) {
+               guint32 info_len;
+               guint8 *unwind_info = mono_unwind_ops_encode (cfg->unwind_ops, &info_len);
+               guint32 unwind_desc;
 
-               /*
-                * SGEN requires the JIT info for these methods to be registered, see is_ip_in_managed_allocator ().
-                */
-               ji = mini_jit_info_table_find (mono_domain_get (), code, &d);
-               g_assert (ji);
-       }
+               unwind_desc = mono_cache_unwind_info (unwind_info, info_len);
 
-       p = mono_create_ftnptr (target_domain, code);
+               if (cfg->has_unwind_info_for_epilog) {
+                       MonoArchEHJitInfo *info;
 
-       if (callinfo) {
-               /*mono_register_jit_icall_wrapper takes the loader lock, so we take it on the outside. */
-               mono_loader_lock ();
-               mono_jit_lock ();
-               if (!callinfo->wrapper) {
-                       callinfo->wrapper = p;
-                       mono_register_jit_icall_wrapper (callinfo, p);
+                       info = mono_jit_info_get_arch_eh_info (jinfo);
+                       g_assert (info);
+                       info->epilog_size = cfg->code_len - cfg->epilog_begin;
                }
-               mono_jit_unlock ();
-               mono_loader_unlock ();
+               jinfo->unwind_info = unwind_desc;
+               g_free (unwind_info);
+       } else {
+               jinfo->unwind_info = cfg->used_int_regs;
        }
 
-       return p;
+       return jinfo;
 }
+#endif
 
-gpointer
-mono_jit_compile_method (MonoMethod *method)
+/* Return whenever METHOD is a gsharedvt method */
+static gboolean
+is_gsharedvt_method (MonoMethod *method)
 {
-       MonoException *ex = NULL;
-       gpointer code;
+       MonoGenericContext *context;
+       MonoGenericInst *inst;
+       int i;
 
-       code = mono_jit_compile_method_with_opt (method, mono_get_optimizations_for_method (method, default_opt), &ex);
-       if (!code) {
-               g_assert (ex);
-               mono_raise_exception (ex);
+       if (!method->is_inflated)
+               return FALSE;
+       context = mono_method_get_context (method);
+       inst = context->class_inst;
+       if (inst) {
+               for (i = 0; i < inst->type_argc; ++i)
+                       if (mini_is_gsharedvt_gparam (inst->type_argv [i]))
+                               return TRUE;
        }
-
-       return code;
-}
-
-#ifdef MONO_ARCH_HAVE_INVALIDATE_METHOD
-static void
-invalidated_delegate_trampoline (char *desc)
-{
-       g_error ("Unmanaged code called delegate of type %s which was already garbage collected.\n"
-                "See http://www.mono-project.com/Diagnostic:Delegate for an explanation and ways to fix this.",
-                desc);
+       inst = context->method_inst;
+       if (inst) {
+               for (i = 0; i < inst->type_argc; ++i)
+                       if (mini_is_gsharedvt_gparam (inst->type_argv [i]))
+                               return TRUE;
+       }
+       return FALSE;
 }
-#endif
 
-/*
- * mono_jit_free_method:
- *
- *  Free all memory allocated by the JIT for METHOD.
- */
-static void
-mono_jit_free_method (MonoDomain *domain, MonoMethod *method)
+static gboolean
+is_open_method (MonoMethod *method)
 {
-       MonoJitDynamicMethodInfo *ji;
-       gboolean destroy = TRUE;
-       GHashTableIter iter;
-       MonoJumpList *jlist;
-
-       g_assert (method->dynamic);
+       MonoGenericContext *context;
 
-       mono_domain_lock (domain);
-       ji = mono_dynamic_code_hash_lookup (domain, method);
-       mono_domain_unlock (domain);
+       if (!method->is_inflated)
+               return FALSE;
+       context = mono_method_get_context (method);
+       if (context->class_inst && context->class_inst->is_open)
+               return TRUE;
+       if (context->method_inst && context->method_inst->is_open)
+               return TRUE;
+       return FALSE;
+}
 
-       if (!ji)
-               return;
+#ifndef DISABLE_JIT
 
-       mono_debug_remove_method (method, domain);
+#if defined(__native_client_codegen__) || USE_COOP_GC
 
-       mono_domain_lock (domain);
-       g_hash_table_remove (domain_jit_info (domain)->dynamic_code_hash, method);
-       mono_domain_jit_code_hash_lock (domain);
-       mono_internal_hash_table_remove (&domain->jit_code_hash, method);
-       mono_domain_jit_code_hash_unlock (domain);
-       g_hash_table_remove (domain_jit_info (domain)->jump_trampoline_hash, method);
-       mono_conc_hashtable_remove (domain_jit_info (domain)->runtime_invoke_hash, method);
+static void
+mono_create_gc_safepoint (MonoCompile *cfg, MonoBasicBlock *bblock)
+{
+       MonoInst *poll_addr, *ins;
+       if (cfg->verbose_level)
+               printf ("ADDING SAFE POINT TO BB %d\n", bblock->block_num);
 
-       /* Remove jump targets in this method */
-       g_hash_table_iter_init (&iter, domain_jit_info (domain)->jump_target_hash);
-       while (g_hash_table_iter_next (&iter, NULL, (void**)&jlist)) {
-               GSList *tmp, *remove;
+#if defined(__native_client_codegen__)
+       NEW_AOTCONST (cfg, poll_addr, MONO_PATCH_INFO_GC_SAFE_POINT_FLAG, (gpointer)&__nacl_thread_suspension_needed);
+#else
+       NEW_AOTCONST (cfg, poll_addr, MONO_PATCH_INFO_GC_SAFE_POINT_FLAG, (gpointer)&mono_polling_required);
+#endif
 
-               remove = NULL;
-               for (tmp = jlist->list; tmp; tmp = tmp->next) {
-                       guint8 *ip = tmp->data;
+       MONO_INST_NEW (cfg, ins, OP_GC_SAFE_POINT);
+       ins->sreg1 = poll_addr->dreg;
 
-                       if (ip >= (guint8*)ji->ji->code_start && ip < (guint8*)ji->ji->code_start + ji->ji->code_size)
-                               remove = g_slist_prepend (remove, tmp);
-               }
-               for (tmp = remove; tmp; tmp = tmp->next) {
-                       jlist->list = g_slist_delete_link (jlist->list, tmp->data);
-               }
-               g_slist_free (remove);
-       }
+        if (bblock->flags & BB_EXCEPTION_HANDLER) {
+               MonoInst *eh_op = bblock->code;
 
-       mono_domain_unlock (domain);
+               // we only skip the ops that start EH blocks.
+               if (eh_op && eh_op->opcode != OP_START_HANDLER && eh_op->opcode != OP_GET_EX_OBJ)
+                       eh_op = NULL;
 
-#ifdef MONO_ARCH_HAVE_INVALIDATE_METHOD
-       if (debug_options.keep_delegates && method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED) {
-               /*
-                * Instead of freeing the code, change it to call an error routine
-                * so people can fix their code.
-                */
-               char *type = mono_type_full_name (&method->klass->byval_arg);
-               char *type_and_method = g_strdup_printf ("%s.%s", type, method->name);
+               mono_bblock_insert_after_ins (bblock, eh_op, poll_addr);
+               mono_bblock_insert_after_ins (bblock, poll_addr, ins);
+       } else if (bblock == cfg->bb_entry) {
+               mono_bblock_insert_after_ins (bblock, bblock->last_ins, poll_addr);
+               mono_bblock_insert_after_ins (bblock, poll_addr, ins);
 
-               g_free (type);
-               mono_arch_invalidate_method (ji->ji, invalidated_delegate_trampoline, type_and_method);
-               destroy = FALSE;
+       } else {
+               mono_bblock_insert_before_ins (bblock, NULL, poll_addr);
+               mono_bblock_insert_after_ins (bblock, poll_addr, ins);
        }
-#endif
+}
 
-       /* 
-        * This needs to be done before freeing code_mp, since the code address is the
-        * key in the table, so if we free the code_mp first, another thread can grab the
-        * same code address and replace our entry in the table.
-        */
-       mono_jit_info_table_remove (domain, ji->ji);
+/*
+This code inserts safepoints into managed code at important code paths.
+Those are:
 
-       if (destroy)
-               mono_code_manager_destroy (ji->code_mp);
-       g_free (ji);
-}
+-the first basic block
+-landing BB for exception handlers
+-loop body starts.
 
-gpointer
-mono_jit_find_compiled_method_with_jit_info (MonoDomain *domain, MonoMethod *method, MonoJitInfo **ji)
+*/
+static void
+mono_insert_safepoints (MonoCompile *cfg)
 {
-       MonoDomain *target_domain;
-       MonoJitInfo *info;
+       MonoBasicBlock *bb;
 
-       if (default_opt & MONO_OPT_SHARED)
-               target_domain = mono_get_root_domain ();
-       else 
-               target_domain = domain;
+       if (cfg->verbose_level)
+               printf ("INSERTING SAFEPOINTS\n");
 
-       info = lookup_method (target_domain, method);
-       if (info) {
-               /* We can't use a domain specific method in another domain */
-               if (! ((domain != target_domain) && !info->domain_neutral)) {
-                       mono_jit_stats.methods_lookups++;
-                       if (ji)
-                               *ji = info;
-                       return info->code_start;
-               }
+       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+               if (bb->loop_body_start || bb == cfg->bb_entry || bb->flags & BB_EXCEPTION_HANDLER)
+                       mono_create_gc_safepoint (cfg, bb);
        }
-
-       if (ji)
-               *ji = NULL;
-       return NULL;
 }
 
-gboolean mono_do_single_method_regression = FALSE;
-guint32 mono_single_method_regression_opt = 0;
-MonoMethod *mono_current_single_method;
-GSList *mono_single_method_list;
-GHashTable *mono_single_method_hash;
-
-guint32
-mono_get_optimizations_for_method (MonoMethod *method, guint32 default_opt)
-{
-       g_assert (method);
-
-       if (!mono_do_single_method_regression)
-               return default_opt;
-       if (!mono_current_single_method) {
-               if (!mono_single_method_hash)
-                       mono_single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-               if (!g_hash_table_lookup (mono_single_method_hash, method)) {
-                       g_hash_table_insert (mono_single_method_hash, method, method);
-                       mono_single_method_list = g_slist_prepend (mono_single_method_list, method);
-               }
-               return default_opt;
-       }
-       if (method == mono_current_single_method)
-               return mono_single_method_regression_opt;
-       return default_opt;
-}
+#else
 
-gpointer
-mono_jit_find_compiled_method (MonoDomain *domain, MonoMethod *method)
+static void
+mono_insert_safepoints (MonoCompile *cfg)
 {
-       return mono_jit_find_compiled_method_with_jit_info (domain, method, NULL);
 }
 
-typedef struct {
-       MonoMethod *method;
-       gpointer compiled_method;
-       gpointer runtime_invoke;
-       MonoVTable *vtable;
-       MonoDynCallInfo *dyn_call_info;
-       MonoClass *ret_box_class;
-} RuntimeInvokeInfo;
+#endif
 
-/**
- * mono_jit_runtime_invoke:
- * @method: the method to invoke
- * @obj: this pointer
- * @params: array of parameter values.
- * @exc: used to catch exceptions objects
+/*
+ * mini_method_compile:
+ * @method: the method to compile
+ * @opts: the optimization flags to use
+ * @domain: the domain where the method will be compiled in
+ * @flags: compilation flags
+ * @parts: debug flag
+ *
+ * Returns: a MonoCompile* pointer. Caller must check the exception_type
+ * field in the returned struct to see if compilation succeded.
  */
-static MonoObject*
-mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc)
+MonoCompile*
+mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFlags flags, int parts)
 {
-       MonoMethod *invoke, *callee;
-       MonoObject *(*runtime_invoke) (MonoObject *this, void **params, MonoObject **exc, void* compiled_method);
-       MonoDomain *domain = mono_domain_get ();
-       MonoJitDomainInfo *domain_info;
-       RuntimeInvokeInfo *info, *info2;
-       
-       if (obj == NULL && !(method->flags & METHOD_ATTRIBUTE_STATIC) && !method->string_ctor && (method->wrapper_type == 0)) {
-               g_warning ("Ignoring invocation of an instance method on a NULL instance.\n");
-               return NULL;
-       }
-
-       domain_info = domain_jit_info (domain);
-
-       info = mono_conc_hashtable_lookup (domain_info->runtime_invoke_hash, method);
+       MonoMethodHeader *header;
+       MonoMethodSignature *sig;
+       MonoError err;
+       MonoCompile *cfg;
+       int dfn, i, code_size_ratio;
+       gboolean try_generic_shared, try_llvm = FALSE;
+       MonoMethod *method_to_compile, *method_to_register;
+       gboolean method_is_gshared = FALSE;
+       gboolean run_cctors = (flags & JIT_FLAG_RUN_CCTORS) ? 1 : 0;
+       gboolean compile_aot = (flags & JIT_FLAG_AOT) ? 1 : 0;
+       gboolean full_aot = (flags & JIT_FLAG_FULL_AOT) ? 1 : 0;
+       gboolean disable_direct_icalls = (flags & JIT_FLAG_NO_DIRECT_ICALLS) ? 1 : 0;
+       gboolean gsharedvt_method = FALSE;
+#ifdef ENABLE_LLVM
+       gboolean llvm = (flags & JIT_FLAG_LLVM) ? 1 : 0;
+#endif
+       static gboolean verbose_method_inited;
+       static const char *verbose_method_name;
 
-       if (!info) {
-               if (mono_security_core_clr_enabled ()) {
-                       /* 
-                        * This might be redundant since mono_class_vtable () already does this,
-                        * but keep it just in case for moonlight.
-                        */
-                       mono_class_setup_vtable (method->klass);
-                       if (method->klass->exception_type != MONO_EXCEPTION_NONE) {
-                               if (exc)
-                                       *exc = (MonoObject*)mono_class_get_exception_for_failure (method->klass);
-                               else
-                                       mono_raise_exception (mono_class_get_exception_for_failure (method->klass));
-                               return NULL;
-                       }
-               }
+       InterlockedIncrement (&mono_jit_stats.methods_compiled);
+       if (mono_profiler_get_events () & MONO_PROFILE_JIT_COMPILATION)
+               mono_profiler_method_jit (method);
+       if (MONO_METHOD_COMPILE_BEGIN_ENABLED ())
+               MONO_PROBE_METHOD_COMPILE_BEGIN (method);
 
-               info = g_new0 (RuntimeInvokeInfo, 1);
+       /*
+        * In AOT mode, method can be the following:
+        * - the generic method definition. In this case, we are compiling the fully shared
+        *   version of the method, i.e. the version where all the type parameters are
+        *   reference types.
+        * - a gsharedvt method.
+        * - a method inflated with type parameters. This is for partial sharing.
+        * - a method inflated with concrete types.
+        */
+       if (compile_aot)
+               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
+                       (opts & MONO_OPT_GSHARED) && ((method->is_generic || method->klass->generic_container) || (!method->klass->generic_class && mono_method_is_generic_sharable_full (method, TRUE, FALSE, FALSE)));
+       else
+               try_generic_shared = mono_class_generic_sharing_enabled (method->klass) &&
+                       (opts & MONO_OPT_GSHARED) && mono_method_is_generic_sharable (method, FALSE);
 
-               invoke = mono_marshal_get_runtime_invoke (method, FALSE);
-               info->vtable = mono_class_vtable_full (domain, method->klass, TRUE);
-               g_assert (info->vtable);
+       /*
+       if (try_generic_shared && !mono_debug_count ())
+               try_generic_shared = FALSE;
+       */
 
-               callee = method;
-               if (method->klass->rank && (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
-                       (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)) {
-                       /* 
-                        * Array Get/Set/Address methods. The JIT implements them using inline code 
-                        * inside the runtime invoke wrappers, so no need to compile them.
-                        */
-                       if (mono_aot_only) {
-                               /*
-                                * Call a wrapper, since the runtime invoke wrapper was not generated.
-                                */
-                               MonoMethod *wrapper;
+       if (opts & MONO_OPT_GSHARED) {
+               if (try_generic_shared)
+                       mono_stats.generics_sharable_methods++;
+               else if (mono_method_is_generic_impl (method))
+                       mono_stats.generics_unsharable_methods++;
+       }
 
-                               wrapper = mono_marshal_get_array_accessor_wrapper (method);
-                               invoke = mono_marshal_get_runtime_invoke (wrapper, FALSE);
-                               callee = wrapper;
-                       } else {
-                               callee = NULL;
-                       }
-               }
+       if (mini_is_gsharedvt_sharable_method (method)) {
+               if (!mono_debug_count ())
+                       try_generic_shared = FALSE;
+               if (compile_aot)
+                       try_generic_shared = FALSE;
+       }
 
-               if (callee) {
-                       MonoException *jit_ex = NULL;
+       gsharedvt_method = is_gsharedvt_method (method);
+       if (gsharedvt_method || (compile_aot && is_open_method (method))) {
+               /* We are AOTing a gshared method directly */
+               method_is_gshared = TRUE;
+               g_assert (compile_aot);
+               try_generic_shared = TRUE;
+       }
 
-                       info->compiled_method = mono_jit_compile_method_with_opt (callee, mono_get_optimizations_for_method (callee, default_opt), &jit_ex);
-                       if (!info->compiled_method) {
-                               g_free (info);
-                               g_assert (jit_ex);
-                               if (exc) {
-                                       *exc = (MonoObject*)jit_ex;
-                                       return NULL;
-                               } else {
-                                       mono_raise_exception (jit_ex);
-                               }
-                       }
+#ifdef ENABLE_LLVM
+       try_llvm = mono_use_llvm || llvm;
+#endif
 
-                       info->compiled_method = mini_add_method_trampoline (NULL, callee, info->compiled_method, mono_method_needs_static_rgctx_invoke (callee, FALSE), FALSE);
+ restart_compile:
+       if (method_is_gshared) {
+               method_to_compile = method;
+       } else {
+               if (try_generic_shared) {
+                       method_to_compile = mini_get_shared_method (method);
+                       g_assert (method_to_compile);
                } else {
-                       info->compiled_method = NULL;
+                       method_to_compile = method;
                }
+       }
 
-               /*
-                * We want to avoid AOTing 1000s of runtime-invoke wrappers when running
-                * in full-aot mode, so we use a slower, but more generic wrapper if
-                * possible, built on top of the OP_DYN_CALL opcode provided by the JIT.
-                */
-#ifdef MONO_ARCH_DYN_CALL_SUPPORTED
-               if (mono_aot_only || debug_options.dyn_runtime_invoke) {
-                       MonoType *ret_type;
-                       MonoMethodSignature *sig = mono_method_signature (method);
-                       gboolean supported = TRUE;
-                       int i;
+       cfg = g_new0 (MonoCompile, 1);
+       cfg->method = method_to_compile;
+       cfg->header = mono_method_get_header (cfg->method);
+       cfg->mempool = mono_mempool_new ();
+       cfg->opt = opts;
+       cfg->prof_options = mono_profiler_get_events ();
+       cfg->run_cctors = run_cctors;
+       cfg->domain = domain;
+       cfg->verbose_level = mini_verbose;
+       cfg->compile_aot = compile_aot;
+       cfg->full_aot = full_aot;
+       cfg->skip_visibility = method->skip_visibility;
+       cfg->orig_method = method;
+       cfg->gen_seq_points = debug_options.gen_seq_points_compact_data || debug_options.gen_sdb_seq_points;
+       cfg->gen_sdb_seq_points = debug_options.gen_sdb_seq_points;
 
-                       if (method->string_ctor)
-                               sig = mono_marshal_get_string_ctor_signature (method);
+#ifdef PLATFORM_ANDROID
+       if (cfg->method->wrapper_type != MONO_WRAPPER_NONE) {
+               /* FIXME: Why is this needed */
+               cfg->gen_seq_points = FALSE;
+               cfg->gen_sdb_seq_points = FALSE;
+       }
+#endif
+       /* coop / nacl requires loop detection to happen */
+#if defined(__native_client_codegen__) || defined(USE_COOP_GC)
+       cfg->opt |= MONO_OPT_LOOP;
+#endif
 
-                       for (i = 0; i < sig->param_count; ++i) {
-                               MonoType *t = sig->params [i];
+       cfg->explicit_null_checks = debug_options.explicit_null_checks;
+       cfg->soft_breakpoints = debug_options.soft_breakpoints;
+       cfg->check_pinvoke_callconv = debug_options.check_pinvoke_callconv;
+       cfg->disable_direct_icalls = disable_direct_icalls;
+       if (try_generic_shared)
+               cfg->generic_sharing_context = (MonoGenericSharingContext*)&cfg->gsctx;
+       cfg->compile_llvm = try_llvm;
+       cfg->token_info_hash = g_hash_table_new (NULL, NULL);
 
-                               if (t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type (t)))
-                                       supported = FALSE;
-                       }
+       if (!mono_debug_count ())
+               cfg->opt &= ~MONO_OPT_FLOAT32;
+       cfg->r4fp = (cfg->opt & MONO_OPT_FLOAT32) ? 1 : 0;
+       cfg->r4_stack_type = cfg->r4fp ? STACK_R4 : STACK_R8;
 
-                       if (mono_class_is_contextbound (method->klass) || !info->compiled_method)
-                               supported = FALSE;
+       if (cfg->gen_seq_points)
+               cfg->seq_points = g_ptr_array_new ();
+       mono_error_init (&cfg->error);
 
-                       if (supported)
-                               info->dyn_call_info = mono_arch_dyn_call_prepare (sig);
+       if (cfg->compile_aot && !try_generic_shared && (method->is_generic || method->klass->generic_container || method_is_gshared)) {
+               cfg->exception_type = MONO_EXCEPTION_GENERIC_SHARING_FAILED;
+               return cfg;
+       }
 
-                       ret_type = sig->ret;
-                       if (info->dyn_call_info) {
-                               switch (ret_type->type) {
-                               case MONO_TYPE_VOID:
-                                       break;
-                               case MONO_TYPE_I1:
-                               case MONO_TYPE_U1:
-                               case MONO_TYPE_I2:
-                               case MONO_TYPE_U2:
-                               case MONO_TYPE_I4:
-                               case MONO_TYPE_U4:
-                               case MONO_TYPE_I:
-                               case MONO_TYPE_U:
-                               case MONO_TYPE_I8:
-                               case MONO_TYPE_U8:
-                               case MONO_TYPE_BOOLEAN:
-                               case MONO_TYPE_CHAR:
-                               case MONO_TYPE_R4:
-                               case MONO_TYPE_R8:
-                                       info->ret_box_class = mono_class_from_mono_type (ret_type);
-                                       break;
-                               case MONO_TYPE_PTR:
-                                       info->ret_box_class = mono_defaults.int_class;
-                                       break;
-                               case MONO_TYPE_STRING:
-                               case MONO_TYPE_CLASS:  
-                               case MONO_TYPE_ARRAY:
-                               case MONO_TYPE_SZARRAY:
-                               case MONO_TYPE_OBJECT:
-                                       break;
-                               case MONO_TYPE_GENERICINST:
-                                       if (!MONO_TYPE_IS_REFERENCE (ret_type))
-                                               info->ret_box_class = mono_class_from_mono_type (ret_type);
-                                       break;
-                               case MONO_TYPE_VALUETYPE:
-                                       info->ret_box_class = mono_class_from_mono_type (ret_type);
-                                       break;
-                               default:
-                                       g_assert_not_reached ();
-                                       break;
-                               }
-                       }
-               }
-#endif
+       if (cfg->generic_sharing_context && (gsharedvt_method || mini_is_gsharedvt_sharable_method (method))) {
+               MonoMethodInflated *inflated;
+               MonoGenericContext *context;
 
-               if (!info->dyn_call_info)
-                       info->runtime_invoke = mono_jit_compile_method (invoke);
+               if (gsharedvt_method) {
+                       g_assert (method->is_inflated);
+                       inflated = (MonoMethodInflated*)method;
+                       context = &inflated->context;
 
-               info2 = mono_conc_hashtable_insert (domain_info->runtime_invoke_hash, method, info);
-               if (info2) {
-                       g_free (info);
-                       info = info2;
+                       /* We are compiling a gsharedvt method directly */
+                       g_assert (compile_aot);
+               } else {
+                       g_assert (method_to_compile->is_inflated);
+                       inflated = (MonoMethodInflated*)method_to_compile;
+                       context = &inflated->context;
                }
-       }
 
-       runtime_invoke = info->runtime_invoke;
+               mini_init_gsctx (NULL, cfg->mempool, context, &cfg->gsctx);
+               cfg->gsctx_context = context;
 
-       /*
-        * We need this here because mono_marshal_get_runtime_invoke can place 
-        * the helper method in System.Object and not the target class.
-        */
-       if (exc) {
-               *exc = (MonoObject*)mono_runtime_class_init_full (info->vtable, FALSE);
-               if (*exc)
-                       return NULL;
+               cfg->gsharedvt = TRUE;
+               // FIXME:
+               cfg->disable_llvm = TRUE;
+       }
+
+       if (cfg->generic_sharing_context) {
+               method_to_register = method_to_compile;
+               cfg->gshared = TRUE;
        } else {
-               mono_runtime_class_init (info->vtable);
+               g_assert (method == method_to_compile);
+               method_to_register = method;
        }
+       cfg->method_to_register = method_to_register;
 
-       /* The wrappers expect this to be initialized to NULL */
-       if (exc)
-               *exc = NULL;
+       mono_error_init (&err);
+       sig = mono_method_signature_checked (cfg->method, &err);        
+       if (!sig) {
+               cfg->exception_type = MONO_EXCEPTION_TYPE_LOAD;
+               cfg->exception_message = g_strdup (mono_error_get_message (&err));
+               mono_error_cleanup (&err);
+               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
+               return cfg;
+       }
 
-#ifdef MONO_ARCH_DYN_CALL_SUPPORTED
-       if (info->dyn_call_info) {
-               MonoMethodSignature *sig = mono_method_signature (method);
-               gpointer *args;
-               static RuntimeInvokeDynamicFunction dyn_runtime_invoke;
-               int i, pindex;
-               guint8 buf [256];
-               guint8 retval [256];
+       header = cfg->header;
+       if (!header) {
+               MonoLoaderError *error;
 
-               if (!dyn_runtime_invoke) {
-                       invoke = mono_marshal_get_runtime_invoke_dynamic ();
-                       dyn_runtime_invoke = mono_jit_compile_method (invoke);
+               if ((error = mono_loader_get_last_error ())) {
+                       cfg->exception_type = error->exception_type;
+               } else {
+                       cfg->exception_type = MONO_EXCEPTION_INVALID_PROGRAM;
+                       cfg->exception_message = g_strdup_printf ("Missing or incorrect header for method %s", cfg->method->name);
                }
+               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
+               return cfg;
+       }
 
-               /* Convert the arguments to the format expected by start_dyn_call () */
-               args = g_alloca ((sig->param_count + sig->hasthis) * sizeof (gpointer));
-               pindex = 0;
-               if (sig->hasthis)
-                       args [pindex ++] = &obj;
-               for (i = 0; i < sig->param_count; ++i) {
-                       MonoType *t = sig->params [i];
+#ifdef ENABLE_LLVM
+       {
+               static gboolean inited;
 
-                       if (t->byref) {
-                               args [pindex ++] = &params [i];
-                       } else if (MONO_TYPE_IS_REFERENCE (t) || t->type == MONO_TYPE_PTR) {
-                               args [pindex ++] = &params [i];
-                       } else {
-                               args [pindex ++] = params [i];
+               if (!inited)
+                       inited = TRUE;
+
+               /* 
+                * Check for methods which cannot be compiled by LLVM early, to avoid
+                * the extra compilation pass.
+                */
+               if (COMPILE_LLVM (cfg)) {
+                       mono_llvm_check_method_supported (cfg);
+                       if (cfg->disable_llvm) {
+                               if (cfg->verbose_level >= 1) {
+                                       //nm = mono_method_full_name (cfg->method, TRUE);
+                                       printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
+                                       //g_free (nm);
+                               }
+                               mono_destroy_compile (cfg);
+                               try_llvm = FALSE;
+                               goto restart_compile;
                        }
                }
-
-               //printf ("M: %s\n", mono_method_full_name (method, TRUE));
-
-               mono_arch_start_dyn_call (info->dyn_call_info, (gpointer**)args, retval, buf, sizeof (buf));
-
-               dyn_runtime_invoke (buf, exc, info->compiled_method);
-
-               mono_arch_finish_dyn_call (info->dyn_call_info, buf);
-
-               if (info->ret_box_class)
-                       return mono_value_box (domain, info->ret_box_class, retval);
-               else
-                       return *(MonoObject**)retval;
        }
 #endif
 
-       return runtime_invoke (obj, params, exc, info->compiled_method);
-}
+       /* The debugger has no liveness information, so avoid sharing registers/stack slots */
+       if (debug_options.mdb_optimizations) {
+               cfg->disable_reuse_registers = TRUE;
+               cfg->disable_reuse_stack_slots = TRUE;
+               /* 
+                * This decreases the change the debugger will read registers/stack slots which are
+                * not yet initialized.
+                */
+               cfg->disable_initlocals_opt = TRUE;
 
-MONO_SIG_HANDLER_FUNC (, mono_sigfpe_signal_handler)
-{
-       MonoException *exc = NULL;
-       MonoJitInfo *ji;
-       MONO_SIG_HANDLER_INFO_TYPE *info = MONO_SIG_HANDLER_GET_INFO ();
-       MONO_SIG_HANDLER_GET_CONTEXT;
+               cfg->extend_live_ranges = TRUE;
 
-       ji = mono_jit_info_table_find (mono_domain_get (), mono_arch_ip_from_context (ctx));
+               /* Temporarily disable this when running in the debugger until we have support
+                * for this in the debugger. */
+               /* This is no longer needed with sdb */
+               //cfg->disable_omit_fp = TRUE;
 
-#if defined(MONO_ARCH_HAVE_IS_INT_OVERFLOW)
-       if (mono_arch_is_int_overflow (ctx, info))
-               /*
-                * The spec says this throws ArithmeticException, but MS throws the derived
-                * OverflowException.
-                */
-               exc = mono_get_exception_overflow ();
-       else
-               exc = mono_get_exception_divide_by_zero ();
-#else
-       exc = mono_get_exception_divide_by_zero ();
-#endif
+               /* The debugger needs all locals to be on the stack or in a global register */
+               cfg->disable_vreg_to_lvreg = TRUE;
 
-       if (!ji) {
-               if (!mono_do_crash_chaining && mono_chain_signal (MONO_SIG_HANDLER_PARAMS))
-                       return;
+               /* Don't remove unused variables when running inside the debugger since the user
+                * may still want to view them. */
+               cfg->disable_deadce_vars = TRUE;
 
-               mono_handle_native_sigsegv (SIGSEGV, ctx, info);
-               if (mono_do_crash_chaining) {
-                       mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
-                       return;
-               }
+               // cfg->opt |= MONO_OPT_SHARED;
+               cfg->opt &= ~MONO_OPT_DEADCE;
+               cfg->opt &= ~MONO_OPT_INLINE;
+               cfg->opt &= ~MONO_OPT_COPYPROP;
+               cfg->opt &= ~MONO_OPT_CONSPROP;
+               /* This is no longer needed with sdb */
+               //cfg->opt &= ~MONO_OPT_GSHARED;
+
+               /* This is needed for the soft debugger, which doesn't like code after the epilog */
+               cfg->disable_out_of_line_bblocks = TRUE;
        }
-       
-       mono_arch_handle_exception (ctx, exc);
-}
 
-MONO_SIG_HANDLER_FUNC (, mono_sigill_signal_handler)
-{
-       MonoException *exc;
-       MONO_SIG_HANDLER_GET_CONTEXT;
+       if (mono_using_xdebug) {
+               /* 
+                * Make each variable use its own register/stack slot and extend 
+                * their liveness to cover the whole method, making them displayable
+                * in gdb even after they are dead.
+                */
+               cfg->disable_reuse_registers = TRUE;
+               cfg->disable_reuse_stack_slots = TRUE;
+               cfg->extend_live_ranges = TRUE;
+               cfg->compute_precise_live_ranges = TRUE;
+       }
 
-       exc = mono_get_exception_execution_engine ("SIGILL");
-       
-       mono_arch_handle_exception (ctx, exc);
-}
+       mini_gc_init_cfg (cfg);
 
-#if defined(MONO_ARCH_USE_SIGACTION) || defined(HOST_WIN32)
-#define HAVE_SIG_INFO
-#endif
+       if (COMPILE_LLVM (cfg)) {
+               cfg->opt |= MONO_OPT_ABCREM;
+       }
 
-MONO_SIG_HANDLER_FUNC (, mono_sigsegv_signal_handler)
-{
-       MonoJitInfo *ji;
-       MonoJitTlsData *jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
-       gpointer fault_addr = NULL;
-#ifdef HAVE_SIG_INFO
-       MONO_SIG_HANDLER_INFO_TYPE *info = MONO_SIG_HANDLER_GET_INFO ();
-#else
-       void *info = NULL;
-#endif
-       MONO_SIG_HANDLER_GET_CONTEXT;
+       if (!verbose_method_inited) {
+               verbose_method_name = g_getenv ("MONO_VERBOSE_METHOD");
+               verbose_method_inited = TRUE;
+       }
+       if (verbose_method_name) {
+               const char *name = verbose_method_name;
 
-#if defined(MONO_ARCH_SOFT_DEBUG_SUPPORTED) && defined(HAVE_SIG_INFO)
-       if (mono_arch_is_single_step_event (info, ctx)) {
-               mono_debugger_agent_single_step_event (ctx);
-               return;
-       } else if (mono_arch_is_breakpoint_event (info, ctx)) {
-               mono_debugger_agent_breakpoint_hit (ctx);
-               return;
+               if ((strchr (name, '.') > name) || strchr (name, ':')) {
+                       MonoMethodDesc *desc;
+                       
+                       desc = mono_method_desc_new (name, TRUE);
+                       if (mono_method_desc_full_match (desc, cfg->method)) {
+                               cfg->verbose_level = 4;
+                       }
+                       mono_method_desc_free (desc);
+               } else {
+                       if (strcmp (cfg->method->name, name) == 0)
+                               cfg->verbose_level = 4;
+               }
        }
-#endif
 
-#if defined(HAVE_SIG_INFO)
-#if !defined(HOST_WIN32)
-       fault_addr = info->si_addr;
-       if (mono_aot_is_pagefault (info->si_addr)) {
-               mono_aot_handle_pagefault (info->si_addr);
-               return;
-       }
-#endif
+       cfg->intvars = mono_mempool_alloc0 (cfg->mempool, sizeof (guint16) * STACK_MAX * header->max_stack);
 
-       /* The thread might no be registered with the runtime */
-       if (!mono_domain_get () || !jit_tls) {
-               if (!mono_do_crash_chaining && mono_chain_signal (MONO_SIG_HANDLER_PARAMS))
-                       return;
-               mono_handle_native_sigsegv (SIGSEGV, ctx, info);
-               if (mono_do_crash_chaining) {
-                       mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
-                       return;
-               }
+       if (cfg->verbose_level > 0) {
+               char *method_name;
+
+               method_name = mono_method_full_name (method, TRUE);
+               g_print ("converting %s%s%smethod %s\n", COMPILE_LLVM (cfg) ? "llvm " : "", cfg->gsharedvt ? "gsharedvt " : "", (cfg->generic_sharing_context && !cfg->gsharedvt) ? "gshared " : "", method_name);
+               /*
+               if (COMPILE_LLVM (cfg))
+                       g_print ("converting llvm method %s\n", method_name = mono_method_full_name (method, TRUE));
+               else if (cfg->gsharedvt)
+                       g_print ("converting gsharedvt method %s\n", method_name = mono_method_full_name (method_to_compile, TRUE));
+               else if (cfg->generic_sharing_context)
+                       g_print ("converting shared method %s\n", method_name = mono_method_full_name (method_to_compile, TRUE));
+               else
+                       g_print ("converting method %s\n", method_name = mono_method_full_name (method, TRUE));
+               */
+               g_free (method_name);
        }
-#endif
 
-       ji = mono_jit_info_table_find (mono_domain_get (), mono_arch_ip_from_context (ctx));
+       if (cfg->opt & MONO_OPT_ABCREM)
+               cfg->opt |= MONO_OPT_SSA;
 
-#ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
-       if (mono_handle_soft_stack_ovf (jit_tls, ji, ctx, info, (guint8*)info->si_addr))
-               return;
+       /* 
+       if ((cfg->method->klass->image != mono_defaults.corlib) || (strstr (cfg->method->klass->name, "StackOverflowException") && strstr (cfg->method->name, ".ctor")) || (strstr (cfg->method->klass->name, "OutOfMemoryException") && strstr (cfg->method->name, ".ctor")))
+               cfg->globalra = TRUE;
+       */
 
-#ifdef MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX
-       /* info->si_addr seems to be NULL on some kernels when handling stack overflows */
-       fault_addr = info->si_addr;
-       if (fault_addr == NULL) {
-               MonoContext mctx;
+       //cfg->globalra = TRUE;
 
-               mono_sigctx_to_monoctx (ctx, &mctx);
+       //if (!strcmp (cfg->method->klass->name, "Tests") && !cfg->method->wrapper_type)
+       //      cfg->globalra = TRUE;
 
-               fault_addr = MONO_CONTEXT_GET_SP (&mctx);
-       }
-#endif
+       {
+               static int count = 0;
+               count ++;
 
-       if (jit_tls->stack_size && 
-               ABS ((guint8*)fault_addr - ((guint8*)jit_tls->end_of_stack - jit_tls->stack_size)) < 8192 * sizeof (gpointer)) {
                /*
-                * The hard-guard page has been hit: there is not much we can do anymore
-                * Print a hopefully clear message and abort.
-                */
-               mono_handle_hard_stack_ovf (jit_tls, ji, ctx, (guint8*)info->si_addr);
-               g_assert_not_reached ();
-       } else {
-               /* The original handler might not like that it is executed on an altstack... */
-               if (!ji && mono_chain_signal (MONO_SIG_HANDLER_PARAMS))
-                       return;
-
-               mono_arch_handle_altstack_exception (ctx, info, info->si_addr, FALSE);
+               if (g_getenv ("COUNT2")) {
+                       cfg->globalra = TRUE;
+                       if (count == atoi (g_getenv ("COUNT2")))
+                               printf ("LAST: %s\n", mono_method_full_name (cfg->method, TRUE));
+                       if (count > atoi (g_getenv ("COUNT2")))
+                               cfg->globalra = FALSE;
+               }
+               */
        }
-#else
 
-       if (!ji) {
-               if (!mono_do_crash_chaining && mono_chain_signal (MONO_SIG_HANDLER_PARAMS))
-                       return;
-
-               mono_handle_native_sigsegv (SIGSEGV, ctx, info);
+       if (header->clauses)
+               cfg->globalra = FALSE;
 
-               if (mono_do_crash_chaining) {
-                       mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
-                       return;
-               }
-       }
-                       
-       mono_arch_handle_exception (ctx, NULL);
-#endif
-}
+       if (cfg->method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED)
+               /* The code in the prolog clobbers caller saved registers */
+               cfg->globalra = FALSE;
 
-MONO_SIG_HANDLER_FUNC (, mono_sigint_signal_handler)
-{
-       MonoException *exc;
-       MONO_SIG_HANDLER_GET_CONTEXT;
+       // FIXME: Disable globalra in case of tracing/profiling
 
-       exc = mono_get_exception_execution_engine ("Interrupted (SIGINT).");
-       
-       mono_arch_handle_exception (ctx, exc);
-}
+       if (cfg->method->save_lmf)
+               /* The LMF saving code might clobber caller saved registers */
+               cfg->globalra = FALSE;
 
-#ifndef DISABLE_REMOTING
-/* mono_jit_create_remoting_trampoline:
- * @method: pointer to the method info
- *
- * Creates a trampoline which calls the remoting functions. This
- * is used in the vtable of transparent proxies.
- * 
- * Returns: a pointer to the newly created code 
- */
-static gpointer
-mono_jit_create_remoting_trampoline (MonoDomain *domain, MonoMethod *method, MonoRemotingTarget target)
-{
-       MonoMethod *nm;
-       guint8 *addr = NULL;
+       if (header->code_size > 5000)
+               // FIXME:
+               /* Too large bblocks could overflow the ins positions */
+               cfg->globalra = FALSE;
 
-       if ((method->flags & METHOD_ATTRIBUTE_VIRTUAL) && mono_method_signature (method)->generic_param_count) {
-               return mono_create_specific_trampoline (method, MONO_TRAMPOLINE_GENERIC_VIRTUAL_REMOTING,
-                       domain, NULL);
-       }
+       cfg->rs = mono_regstate_new ();
+       if (cfg->globalra)
+               cfg->rs->next_vreg = MONO_MAX_IREGS + MONO_MAX_FREGS;
+       cfg->next_vreg = cfg->rs->next_vreg;
 
-       if ((method->flags & METHOD_ATTRIBUTE_ABSTRACT) || 
-           (mono_method_signature (method)->hasthis && (mono_class_is_marshalbyref (method->klass) || method->klass == mono_defaults.object_class))) {
-               nm = mono_marshal_get_remoting_invoke_for_target (method, target);
-               addr = mono_compile_method (nm);
-       } else
-       {
-               addr = mono_compile_method (method);
-       }
-       return mono_get_addr_from_ftnptr (addr);
-}
-#endif
+       /* FIXME: Fix SSA to handle branches inside bblocks */
+       if (cfg->opt & MONO_OPT_SSA)
+               cfg->enable_extended_bblocks = FALSE;
 
-static gpointer *vtable_trampolines;
-static int vtable_trampolines_size;
+       /*
+        * FIXME: This confuses liveness analysis because variables which are assigned after
+        * a branch inside a bblock become part of the kill set, even though the assignment
+        * might not get executed. This causes the optimize_initlocals pass to delete some
+        * assignments which are needed.
+        * Also, the mono_if_conversion pass needs to be modified to recognize the code
+        * created by this.
+        */
+       //cfg->enable_extended_bblocks = TRUE;
 
-gpointer
-mini_get_vtable_trampoline (int slot_index)
-{
-       int index = slot_index + MONO_IMT_SIZE;
-
-       g_assert (slot_index >= - MONO_IMT_SIZE);
-       if (!vtable_trampolines || slot_index + MONO_IMT_SIZE >= vtable_trampolines_size) {
-               mono_jit_lock ();
-               if (!vtable_trampolines || index >= vtable_trampolines_size) {
-                       int new_size;
-                       gpointer new_table;
-
-                       new_size = vtable_trampolines_size ? vtable_trampolines_size * 2 : 128;
-                       while (new_size <= index)
-                               new_size *= 2;
-                       new_table = g_new0 (gpointer, new_size);
-
-                       if (vtable_trampolines)
-                               memcpy (new_table, vtable_trampolines, vtable_trampolines_size * sizeof (gpointer));
-                       g_free (vtable_trampolines);
-                       mono_memory_barrier ();
-                       vtable_trampolines = new_table;
-                       vtable_trampolines_size = new_size;
-               }
-               mono_jit_unlock ();
+       /*We must verify the method before doing any IR generation as mono_compile_create_vars can assert.*/
+       if (mono_compile_is_broken (cfg, cfg->method, TRUE)) {
+               if (mini_get_debug_options ()->break_on_unverified)
+                       G_BREAKPOINT ();
+               return cfg;
        }
 
-       if (!vtable_trampolines [index])
-               vtable_trampolines [index] = mono_create_specific_trampoline (GUINT_TO_POINTER (slot_index), MONO_TRAMPOLINE_VCALL, mono_get_root_domain (), NULL);
-       return vtable_trampolines [index];
-}
-
-gpointer
-mono_get_delegate_virtual_invoke_impl (MonoMethodSignature *sig, MonoMethod *method)
-{
-       gboolean is_virtual_generic, is_interface, load_imt_reg;
-       int offset, idx;
+       /*
+        * create MonoInst* which represents arguments and local variables
+        */
+       mono_compile_create_vars (cfg);
 
-       static guint8 **cache = NULL;
-       static int cache_size = 0;
+       i = mono_method_to_ir (cfg, method_to_compile, NULL, NULL, NULL, NULL, 0, FALSE);
 
-       if (!method)
-               return NULL;
+       if (i < 0) {
+               if (try_generic_shared && cfg->exception_type == MONO_EXCEPTION_GENERIC_SHARING_FAILED) {
+                       if (compile_aot) {
+                               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
+                               return cfg;
+                       }
+                       mono_destroy_compile (cfg);
+                       try_generic_shared = FALSE;
+                       goto restart_compile;
+               }
+               g_assert (cfg->exception_type != MONO_EXCEPTION_GENERIC_SHARING_FAILED);
 
-       /* FIXME Support more cases */
-       if (mono_aot_only)
-               return NULL;
+               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, FALSE);
+               /* cfg contains the details of the failure, so let the caller cleanup */
+               return cfg;
+       }
 
-       if (MONO_TYPE_ISSTRUCT (sig->ret))
-               return NULL;
+       cfg->stat_basic_blocks += cfg->num_bblocks;
 
-       is_virtual_generic = method->is_inflated && mono_method_get_declaring_generic_method (method)->is_generic;
-       is_interface = method->klass->flags & TYPE_ATTRIBUTE_INTERFACE ? TRUE : FALSE;
-       load_imt_reg = is_virtual_generic || is_interface;
+       if (COMPILE_LLVM (cfg)) {
+               MonoInst *ins;
 
-       if (is_interface && !is_virtual_generic)
-               offset = ((gint32)mono_method_get_imt_slot (method) - MONO_IMT_SIZE) * SIZEOF_VOID_P;
-       else
-               offset = G_STRUCT_OFFSET (MonoVTable, vtable) + ((mono_method_get_vtable_index (method)) * (SIZEOF_VOID_P));
-
-       idx = (offset / SIZEOF_VOID_P + MONO_IMT_SIZE) * 2 + (load_imt_reg ? 1 : 0);
-       g_assert (idx >= 0);
-
-       /* Resize the cache to idx + 1 */
-       if (cache_size < idx + 1) {
-               mono_jit_lock ();
-               if (cache_size < idx + 1) {
-                       guint8 **new_cache;
-                       int new_cache_size = idx + 1;
-
-                       new_cache = g_new0 (guint8*, new_cache_size);
-                       if (cache)
-                               memcpy (new_cache, cache, cache_size * sizeof (guint8*));
-                       g_free (cache);
-
-                       mono_memory_barrier ();
-                       cache = new_cache;
-                       cache_size = new_cache_size;
-               }
-               mono_jit_unlock ();
-       }
+               /* The IR has to be in SSA form for LLVM */
+               cfg->opt |= MONO_OPT_SSA;
 
-       if (cache [idx])
-               return cache [idx];
+               // FIXME:
+               if (cfg->ret) {
+                       // Allow SSA on the result value
+                       cfg->ret->flags &= ~MONO_INST_VOLATILE;
 
-       return cache [idx] = mono_arch_get_delegate_virtual_invoke_impl (sig, method, offset, load_imt_reg);
-}
+                       // Add an explicit return instruction referencing the return value
+                       MONO_INST_NEW (cfg, ins, OP_SETRET);
+                       ins->sreg1 = cfg->ret->dreg;
 
-static gpointer
-mini_get_imt_trampoline (int slot_index)
-{
-       return mini_get_vtable_trampoline (slot_index - MONO_IMT_SIZE);
-}
+                       MONO_ADD_INS (cfg->bb_exit, ins);
+               }
 
-static void
-mini_parse_debug_options (void)
-{
-       const char *options = g_getenv ("MONO_DEBUG");
-       gchar **args, **ptr;
-       
-       if (!options)
-               return;
+               cfg->opt &= ~MONO_OPT_LINEARS;
 
-       args = g_strsplit (options, ",", -1);
-
-       for (ptr = args; ptr && *ptr; ptr++) {
-               const char *arg = *ptr;
-
-               if (!strcmp (arg, "handle-sigint"))
-                       debug_options.handle_sigint = TRUE;
-               else if (!strcmp (arg, "keep-delegates"))
-                       debug_options.keep_delegates = TRUE;
-               else if (!strcmp (arg, "reverse-pinvoke-exceptions"))
-                       debug_options.reverse_pinvoke_exceptions = TRUE;
-               else if (!strcmp (arg, "collect-pagefault-stats"))
-                       debug_options.collect_pagefault_stats = TRUE;
-               else if (!strcmp (arg, "break-on-unverified"))
-                       debug_options.break_on_unverified = TRUE;
-               else if (!strcmp (arg, "no-gdb-backtrace"))
-                       debug_options.no_gdb_backtrace = TRUE;
-               else if (!strcmp (arg, "suspend-on-sigsegv"))
-                       debug_options.suspend_on_sigsegv = TRUE;
-               else if (!strcmp (arg, "suspend-on-exception"))
-                       debug_options.suspend_on_exception = TRUE;
-               else if (!strcmp (arg, "suspend-on-unhandled"))
-                       debug_options.suspend_on_unhandled = TRUE;
-               else if (!strcmp (arg, "dont-free-domains"))
-                       mono_dont_free_domains = TRUE;
-               else if (!strcmp (arg, "dyn-runtime-invoke"))
-                       debug_options.dyn_runtime_invoke = TRUE;
-               else if (!strcmp (arg, "gdb"))
-                       debug_options.gdb = TRUE;
-               else if (!strcmp (arg, "explicit-null-checks"))
-                       debug_options.explicit_null_checks = TRUE;
-               else if (!strcmp (arg, "gen-seq-points"))
-                       debug_options.gen_seq_points_debug_data = TRUE;
-               else if (!strcmp (arg, "gen-compact-seq-points"))
-                       debug_options.gen_seq_points_compact_data = TRUE;
-               else if (!strcmp (arg, "init-stacks"))
-                       debug_options.init_stacks = TRUE;
-               else if (!strcmp (arg, "casts"))
-                       debug_options.better_cast_details = TRUE;
-               else if (!strcmp (arg, "soft-breakpoints"))
-                       debug_options.soft_breakpoints = TRUE;
-               else if (!strcmp (arg, "check-pinvoke-callconv"))
-                       debug_options.check_pinvoke_callconv = TRUE;
-               else if (!strcmp (arg, "debug-domain-unload"))
-                       mono_enable_debug_domain_unload (TRUE);
-               else {
-                       fprintf (stderr, "Invalid option for the MONO_DEBUG env variable: %s\n", arg);
-                       fprintf (stderr, "Available options: 'handle-sigint', 'keep-delegates', 'reverse-pinvoke-exceptions', 'collect-pagefault-stats', 'break-on-unverified', 'no-gdb-backtrace', 'dont-free-domains', 'suspend-on-sigsegv', 'suspend-on-exception', 'suspend-on-unhandled', 'dyn-runtime-invoke', 'gdb', 'explicit-null-checks', 'init-stacks', 'check-pinvoke-callconv', 'debug-domain-unload'\n");
-                       exit (1);
-               }
+               /* FIXME: */
+               cfg->opt &= ~MONO_OPT_BRANCH;
        }
 
-       g_strfreev (args);
-}
+       /* todo: remove code when we have verified that the liveness for try/catch blocks
+        * works perfectly 
+        */
+       /* 
+        * Currently, this can't be commented out since exception blocks are not
+        * processed during liveness analysis.
+        * It is also needed, because otherwise the local optimization passes would
+        * delete assignments in cases like this:
+        * r1 <- 1
+        * <something which throws>
+        * r1 <- 2
+        * This also allows SSA to be run on methods containing exception clauses, since
+        * SSA will ignore variables marked VOLATILE.
+        */
+       mono_liveness_handle_exception_clauses (cfg);
 
-MonoDebugOptions *
-mini_get_debug_options (void)
-{
-       return &debug_options;
-}
+       mono_handle_out_of_line_bblock (cfg);
 
-static gpointer
-mini_create_ftnptr (MonoDomain *domain, gpointer addr)
-{
-#if !defined(__ia64__) && (!defined(__ppc64__) && !defined(__powerpc64__) || _CALL_ELF == 2)
-       return addr;
-#else
-       gpointer* desc = NULL;
+       /*g_print ("numblocks = %d\n", cfg->num_bblocks);*/
 
-       if ((desc = g_hash_table_lookup (domain->ftnptrs_hash, addr)))
-               return desc;
-#      ifdef __ia64__
-       desc = mono_domain_code_reserve (domain, 2 * sizeof (gpointer));
+       if (!COMPILE_LLVM (cfg))
+               mono_decompose_long_opts (cfg);
 
-       desc [0] = addr;
-       desc [1] = NULL;
-#      elif defined(__ppc64__) || defined(__powerpc64__)
+       /* Should be done before branch opts */
+       if (cfg->opt & (MONO_OPT_CONSPROP | MONO_OPT_COPYPROP))
+               mono_local_cprop (cfg);
 
-       desc = mono_domain_alloc0 (domain, 3 * sizeof (gpointer));
+       if (cfg->opt & MONO_OPT_BRANCH)
+               mono_optimize_branches (cfg);
 
-       desc [0] = addr;
-       desc [1] = NULL;
-       desc [2] = NULL;
-#      endif
-       g_hash_table_insert (domain->ftnptrs_hash, addr, desc);
-       return desc;
-#endif
-}
+       /* This must be done _before_ global reg alloc and _after_ decompose */
+       mono_handle_global_vregs (cfg);
+       if (cfg->opt & MONO_OPT_DEADCE)
+               mono_local_deadce (cfg);
+       if (cfg->opt & MONO_OPT_ALIAS_ANALYSIS)
+               mono_local_alias_analysis (cfg);
+       /* Disable this for LLVM to make the IR easier to handle */
+       if (!COMPILE_LLVM (cfg))
+               mono_if_conversion (cfg);
 
-static gpointer
-mini_get_addr_from_ftnptr (gpointer descr)
-{
-#if defined(__ia64__) || ((defined(__ppc64__) || defined(__powerpc64__)) && _CALL_ELF != 2)
-       return *(gpointer*)descr;
-#else
-       return descr;
-#endif
-}      
+       if (cfg->globalra)
+               mono_remove_critical_edges (cfg);
 
-static void
-register_jit_stats (void)
-{
-       mono_counters_register ("Compiled methods", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.methods_compiled);
-       mono_counters_register ("Methods from AOT", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.methods_aot);
-       mono_counters_register ("Methods JITted using mono JIT", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.methods_without_llvm);
-       mono_counters_register ("Methods JITted using LLVM", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.methods_with_llvm);   
-       mono_counters_register ("Total time spent JITting (sec)", MONO_COUNTER_JIT | MONO_COUNTER_DOUBLE, &mono_jit_stats.jit_time);
-       mono_counters_register ("Basic blocks", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.basic_blocks);
-       mono_counters_register ("Max basic blocks", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.max_basic_blocks);
-       mono_counters_register ("Allocated vars", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.allocate_var);
-       mono_counters_register ("Code reallocs", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.code_reallocs);
-       mono_counters_register ("Allocated code size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.allocated_code_size);
-       mono_counters_register ("Allocated seq points size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.allocated_seq_points_size);
-       mono_counters_register ("Inlineable methods", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.inlineable_methods);
-       mono_counters_register ("Inlined methods", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.inlined_methods);
-       mono_counters_register ("Regvars", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.regvars);
-       mono_counters_register ("Locals stack size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.locals_stack_size);
-       mono_counters_register ("Method cache lookups", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.methods_lookups);
-       mono_counters_register ("Compiled CIL code size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.cil_code_size);
-       mono_counters_register ("Native code size", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.native_code_size);
-       mono_counters_register ("Aliases found", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.alias_found);
-       mono_counters_register ("Aliases eliminated", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.alias_removed);
-       mono_counters_register ("Aliased loads eliminated", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.loads_eliminated);
-       mono_counters_register ("Aliased stores eliminated", MONO_COUNTER_JIT | MONO_COUNTER_INT, &mono_jit_stats.stores_eliminated);
-}
+       /* Depth-first ordering on basic blocks */
+       cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
 
-static void runtime_invoke_info_free (gpointer value);
+       cfg->max_block_num = cfg->num_bblocks;
 
-static gint
-class_method_pair_equal (gconstpointer ka, gconstpointer kb)
-{
-       const MonoClassMethodPair *apair = ka;
-       const MonoClassMethodPair *bpair = kb;
+       dfn = 0;
+       df_visit (cfg->bb_entry, &dfn, cfg->bblocks);
+       if (cfg->num_bblocks != dfn + 1) {
+               MonoBasicBlock *bb;
 
-       return apair->klass == bpair->klass && apair->method == bpair->method ? 1 : 0;
-}
+               cfg->num_bblocks = dfn + 1;
 
-static guint
-class_method_pair_hash (gconstpointer data)
-{
-       const MonoClassMethodPair *pair = data;
+               /* remove unreachable code, because the code in them may be 
+                * inconsistent  (access to dead variables for example) */
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
+                       bb->flags &= ~BB_VISITED;
+               compute_reachable (cfg->bb_entry);
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
+                       if (bb->flags & BB_EXCEPTION_HANDLER)
+                               compute_reachable (bb);
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+                       if (!(bb->flags & BB_VISITED)) {
+                               if (cfg->verbose_level > 1)
+                                       g_print ("found unreachable code in BB%d\n", bb->block_num);
+                               bb->code = bb->last_ins = NULL;
+                               while (bb->out_count)
+                                       mono_unlink_bblock (cfg, bb, bb->out_bb [0]);
+                       }
+               }
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
+                       bb->flags &= ~BB_VISITED;
+       }
 
-       return (gsize)pair->klass ^ (gsize)pair->method;
-}
+       if (((cfg->num_varinfo > 2000) || (cfg->num_bblocks > 1000)) && !cfg->compile_aot) {
+               /* 
+                * we disable some optimizations if there are too many variables
+                * because JIT time may become too expensive. The actual number needs 
+                * to be tweaked and eventually the non-linear algorithms should be fixed.
+                */
+               cfg->opt &= ~ (MONO_OPT_LINEARS | MONO_OPT_COPYPROP | MONO_OPT_CONSPROP);
+               cfg->disable_ssa = TRUE;
+       }
 
-static void
-mini_create_jit_domain_info (MonoDomain *domain)
-{
-       MonoJitDomainInfo *info = g_new0 (MonoJitDomainInfo, 1);
-
-       info->class_init_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->jump_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->jit_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->delegate_trampoline_hash = g_hash_table_new (class_method_pair_hash, class_method_pair_equal);
-       info->llvm_vcall_trampoline_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->runtime_invoke_hash = mono_conc_hashtable_new_full (&domain->lock, mono_aligned_addr_hash, NULL, NULL, runtime_invoke_info_free);
-       info->seq_points = g_hash_table_new_full (mono_aligned_addr_hash, NULL, NULL, seq_point_info_free);
-       info->arch_seq_points = g_hash_table_new (mono_aligned_addr_hash, NULL);
-       info->jump_target_hash = g_hash_table_new (NULL, NULL);
-
-       domain->runtime_info = info;
-}
+       if (cfg->opt & MONO_OPT_LOOP) {
+               mono_compile_dominator_info (cfg, MONO_COMP_DOM | MONO_COMP_IDOM);
+               mono_compute_natural_loops (cfg);
+       }
 
-static void
-delete_jump_list (gpointer key, gpointer value, gpointer user_data)
-{
-       MonoJumpList *jlist = value;
-       g_slist_free (jlist->list);
-}
+       mono_insert_safepoints (cfg);
 
-static void
-delete_got_slot_list (gpointer key, gpointer value, gpointer user_data)
-{
-       GSList *list = value;
-       g_slist_free (list);
-}
+       /* after method_to_ir */
+       if (parts == 1) {
+               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
+               return cfg;
+       }
 
-static void
-dynamic_method_info_free (gpointer key, gpointer value, gpointer user_data)
-{
-       MonoJitDynamicMethodInfo *di = value;
-       mono_code_manager_destroy (di->code_mp);
-       g_free (di);
-}
+       /*
+         if (header->num_clauses)
+         cfg->disable_ssa = TRUE;
+       */
 
-static void
-runtime_invoke_info_free (gpointer value)
-{
-       RuntimeInvokeInfo *info = (RuntimeInvokeInfo*)value;
+//#define DEBUGSSA "logic_run"
+//#define DEBUGSSA_CLASS "Tests"
+#ifdef DEBUGSSA
 
-#ifdef MONO_ARCH_DYN_CALL_SUPPORTED
-       if (info->dyn_call_info)
-               mono_arch_dyn_call_free (info->dyn_call_info);
-#endif
-       g_free (info);
-}
+       if (!cfg->disable_ssa) {
+               mono_local_cprop (cfg);
 
-static void
-mini_free_jit_domain_info (MonoDomain *domain)
-{
-       MonoJitDomainInfo *info = domain_jit_info (domain);
-
-       g_hash_table_foreach (info->jump_target_hash, delete_jump_list, NULL);
-       g_hash_table_destroy (info->jump_target_hash);
-       if (info->jump_target_got_slot_hash) {
-               g_hash_table_foreach (info->jump_target_got_slot_hash, delete_got_slot_list, NULL);
-               g_hash_table_destroy (info->jump_target_got_slot_hash);
-       }
-       if (info->dynamic_code_hash) {
-               g_hash_table_foreach (info->dynamic_code_hash, dynamic_method_info_free, NULL);
-               g_hash_table_destroy (info->dynamic_code_hash);
-       }
-       if (info->method_code_hash)
-               g_hash_table_destroy (info->method_code_hash);
-       g_hash_table_destroy (info->class_init_trampoline_hash);
-       g_hash_table_destroy (info->jump_trampoline_hash);
-       g_hash_table_destroy (info->jit_trampoline_hash);
-       g_hash_table_destroy (info->delegate_trampoline_hash);
-       if (info->static_rgctx_trampoline_hash)
-               g_hash_table_destroy (info->static_rgctx_trampoline_hash);
-       g_hash_table_destroy (info->llvm_vcall_trampoline_hash);
-       mono_conc_hashtable_destroy (info->runtime_invoke_hash);
-       g_hash_table_destroy (info->seq_points);
-       g_hash_table_destroy (info->arch_seq_points);
-       if (info->agent_info)
-               mono_debugger_agent_free_domain_info (domain);
-       if (info->gsharedvt_arg_tramp_hash)
-               g_hash_table_destroy (info->gsharedvt_arg_tramp_hash);
-#ifdef ENABLE_LLVM
-       mono_llvm_free_domain_info (domain);
+#ifndef DISABLE_SSA
+               mono_ssa_compute (cfg);
 #endif
-
-       g_free (domain->runtime_info);
-       domain->runtime_info = NULL;
-}
-
-#ifdef ENABLE_LLVM
-static gboolean
-llvm_init_inner (void)
-{
-       if (!mono_llvm_load (NULL))
-               return FALSE;
-
-       mono_llvm_init ();
-       return TRUE;
-}
+       }
+#else 
+       if (cfg->opt & MONO_OPT_SSA) {
+               if (!(cfg->comp_done & MONO_COMP_SSA) && !cfg->disable_ssa) {
+#ifndef DISABLE_SSA
+                       mono_ssa_compute (cfg);
 #endif
 
-/*
- * mini_llvm_init:
- *
- *   Load and initialize LLVM support.
- * Return TRUE on success.
- */
-gboolean
-mini_llvm_init (void)
-{
-#ifdef ENABLE_LLVM
-       static gboolean llvm_inited;
-       static gboolean init_result;
-
-       mono_loader_lock_if_inited ();
-       if (!llvm_inited) {
-               init_result = llvm_init_inner ();
-               llvm_inited = TRUE;
+                       if (cfg->verbose_level >= 2) {
+                               print_dfn (cfg);
+                       }
+               }
        }
-       mono_loader_unlock_if_inited ();
-       return init_result;
-#else
-       return FALSE;
 #endif
-}
-
-MonoDomain *
-mini_init (const char *filename, const char *runtime_version)
-{
-       MonoDomain *domain;
-       MonoRuntimeCallbacks callbacks;
-       MonoThreadInfoRuntimeCallbacks ticallbacks;
 
-       MONO_VES_INIT_BEGIN ();
-
-#if defined(__linux__) && !defined(__native_client__)
-       if (access ("/proc/self/maps", F_OK) != 0) {
-               g_print ("Mono requires /proc to be mounted.\n");
-               exit (1);
+       /* after SSA translation */
+       if (parts == 2) {
+               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
+               return cfg;
        }
+
+       if ((cfg->opt & MONO_OPT_CONSPROP) || (cfg->opt & MONO_OPT_COPYPROP)) {
+               if (cfg->comp_done & MONO_COMP_SSA && !COMPILE_LLVM (cfg)) {
+#ifndef DISABLE_SSA
+                       mono_ssa_cprop (cfg);
 #endif
+               }
+       }
 
-       mono_mutex_init_recursive (&jit_mutex);
+#ifndef DISABLE_SSA
+       if (cfg->comp_done & MONO_COMP_SSA && !COMPILE_LLVM (cfg)) {
+               //mono_ssa_strength_reduction (cfg);
 
-       mono_cross_helpers_run ();
+               if (cfg->opt & MONO_OPT_DEADCE)
+                       mono_ssa_deadce (cfg);
 
-       /* Happens when using the embedding interface */
-       if (!default_opt_set)
-               default_opt = mono_parse_default_optimizations (NULL);
+               if ((cfg->flags & (MONO_CFG_HAS_LDELEMA|MONO_CFG_HAS_CHECK_THIS)) && (cfg->opt & MONO_OPT_ABCREM))
+                       mono_perform_abc_removal (cfg);
 
-#ifdef MONO_ARCH_GSHAREDVT_SUPPORTED
-       if (mono_aot_only)
-               mono_set_generic_sharing_vt_supported (TRUE);
-#endif
+               mono_ssa_remove (cfg);
+               mono_local_cprop (cfg);
+               mono_handle_global_vregs (cfg);
+               if (cfg->opt & MONO_OPT_DEADCE)
+                       mono_local_deadce (cfg);
 
-#ifdef MONO_HAVE_FAST_TLS
-       MONO_FAST_TLS_INIT (mono_jit_tls);
-       MONO_FAST_TLS_INIT (mono_lmf_addr);
-#ifdef MONO_ARCH_ENABLE_MONO_LMF_VAR
-       MONO_FAST_TLS_INIT (mono_lmf);
-#endif
-#endif
+               if (cfg->opt & MONO_OPT_BRANCH) {
+                       MonoBasicBlock *bb;
 
-       mono_runtime_set_has_tls_get (MONO_ARCH_HAVE_TLS_GET);
+                       mono_optimize_branches (cfg);
 
-       if (!global_codeman)
-               global_codeman = mono_code_manager_new ();
+                       /* Have to recompute cfg->bblocks and bb->dfn */
+                       if (cfg->globalra) {
+                               mono_remove_critical_edges (cfg);
 
-       memset (&callbacks, 0, sizeof (callbacks));
-       callbacks.create_ftnptr = mini_create_ftnptr;
-       callbacks.get_addr_from_ftnptr = mini_get_addr_from_ftnptr;
-       callbacks.get_runtime_build_info = mono_get_runtime_build_info;
-       callbacks.set_cast_details = mono_set_cast_details;
-       callbacks.debug_log = mono_debugger_agent_debug_log;
-       callbacks.debug_log_is_enabled = mono_debugger_agent_debug_log_is_enabled;
-       callbacks.tls_key_supported = mini_tls_key_supported;
+                               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
+                                       bb->dfn = 0;
 
-       if (mono_use_imt) {
-               callbacks.get_vtable_trampoline = mini_get_vtable_trampoline;
-               callbacks.get_imt_trampoline = mini_get_imt_trampoline;
-       }
+                               /* Depth-first ordering on basic blocks */
+                               cfg->bblocks = mono_mempool_alloc (cfg->mempool, sizeof (MonoBasicBlock*) * (cfg->num_bblocks + 1));
 
-       mono_install_callbacks (&callbacks);
+                               dfn = 0;
+                               df_visit (cfg->bb_entry, &dfn, cfg->bblocks);
+                               cfg->num_bblocks = dfn + 1;
+                       }
+               }
+       }
+#endif
 
-       memset (&ticallbacks, 0, sizeof (ticallbacks));
-       ticallbacks.setup_async_callback = mono_setup_async_callback;
-       ticallbacks.thread_state_init_from_sigctx = mono_thread_state_init_from_sigctx;
-       ticallbacks.thread_state_init_from_handle = mono_thread_state_init_from_handle;
+       if (cfg->comp_done & MONO_COMP_SSA && COMPILE_LLVM (cfg)) {
+               mono_ssa_loop_invariant_code_motion (cfg);
+               /* This removes MONO_INST_FAULT flags too so perform it unconditionally */
+               if (cfg->opt & MONO_OPT_ABCREM)
+                       mono_perform_abc_removal (cfg);
+       }
 
-       mono_counters_init ();
+       /* after SSA removal */
+       if (parts == 3) {
+               if (MONO_METHOD_COMPILE_END_ENABLED ())
+                       MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
+               return cfg;
+       }
 
-       mono_threads_runtime_init (&ticallbacks);
+#ifdef MONO_ARCH_SOFT_FLOAT_FALLBACK
+       if (COMPILE_SOFT_FLOAT (cfg))
+               mono_decompose_soft_float (cfg);
+#endif
+       if (COMPILE_LLVM (cfg))
+               mono_decompose_vtype_opts_llvm (cfg);
+       else
+               mono_decompose_vtype_opts (cfg);
+       if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
+               mono_decompose_array_access_opts (cfg);
 
-       if (g_getenv ("MONO_DEBUG") != NULL)
-               mini_parse_debug_options ();
+       if (cfg->got_var) {
+#ifndef MONO_ARCH_GOT_REG
+               GList *regs;
+#endif
+               int got_reg;
 
-       mono_code_manager_init ();
+               g_assert (cfg->got_var_allocated);
 
-       mono_hwcap_init ();
+               /* 
+                * Allways allocate the GOT var to a register, because keeping it
+                * in memory will increase the number of live temporaries in some
+                * code created by inssel.brg, leading to the well known spills+
+                * branches problem. Testcase: mcs crash in 
+                * System.MonoCustomAttrs:GetCustomAttributes.
+                */
+#ifdef MONO_ARCH_GOT_REG
+               got_reg = MONO_ARCH_GOT_REG;
+#else
+               regs = mono_arch_get_global_int_regs (cfg);
+               g_assert (regs);
+               got_reg = GPOINTER_TO_INT (regs->data);
+               g_list_free (regs);
+#endif
+               cfg->got_var->opcode = OP_REGVAR;
+               cfg->got_var->dreg = got_reg;
+               cfg->used_int_regs |= 1LL << cfg->got_var->dreg;
+       }
 
-       mono_arch_cpu_init ();
+       /*
+        * Have to call this again to process variables added since the first call.
+        */
+       mono_liveness_handle_exception_clauses (cfg);
 
-       mono_arch_init ();
+       if (cfg->globalra) {
+               MonoBasicBlock *bb;
 
-       mono_unwind_init ();
+               /* Have to do this before regalloc since it can create vregs */
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb)
+                       mono_arch_lowering_pass (cfg, bb);
 
-       if (g_getenv ("MONO_XDEBUG")) {
-               const char *xdebug_opts = g_getenv ("MONO_XDEBUG");
-               mono_xdebug_init (xdebug_opts);
-               /* So methods for multiple domains don't have the same address */
-               mono_dont_free_domains = TRUE;
-               mono_using_xdebug = TRUE;
-       } else if (mini_get_debug_options ()->gdb) {
-               mono_xdebug_init ((char*)"gdb");
-               mono_dont_free_domains = TRUE;
-               mono_using_xdebug = TRUE;
+               mono_global_regalloc (cfg);
        }
 
-#ifdef ENABLE_LLVM
-       if (mono_use_llvm) {
-               if (!mono_llvm_load (NULL)) {
-                       mono_use_llvm = FALSE;
-                       fprintf (stderr, "Mono Warning: llvm support could not be loaded.\n");
+       if ((cfg->opt & MONO_OPT_LINEARS) && !cfg->globalra) {
+               GList *vars, *regs, *l;
+               
+               /* fixme: maybe we can avoid to compute livenesss here if already computed ? */
+               cfg->comp_done &= ~MONO_COMP_LIVENESS;
+               if (!(cfg->comp_done & MONO_COMP_LIVENESS))
+                       mono_analyze_liveness (cfg);
+
+               if ((vars = mono_arch_get_allocatable_int_vars (cfg))) {
+                       regs = mono_arch_get_global_int_regs (cfg);
+                       /* Remove the reg reserved for holding the GOT address */
+                       if (cfg->got_var) {
+                               for (l = regs; l; l = l->next) {
+                                       if (GPOINTER_TO_UINT (l->data) == cfg->got_var->dreg) {
+                                               regs = g_list_delete_link (regs, l);
+                                               break;
+                                       }
+                               }
+                       }
+                       mono_linear_scan (cfg, vars, regs, &cfg->used_int_regs);
                }
        }
-       if (mono_use_llvm)
-               mono_llvm_init ();
-#endif
-
-       mono_trampolines_init ();
-
-       mono_native_tls_alloc (&mono_jit_tls_id, NULL);
 
-       if (default_opt & MONO_OPT_AOT)
-               mono_aot_init ();
-
-       mono_debugger_agent_init ();
+       //mono_print_code (cfg, "");
 
-#ifdef MONO_ARCH_GSHARED_SUPPORTED
-       mono_set_generic_sharing_supported (TRUE);
-#endif
+    //print_dfn (cfg);
+       
+       /* variables are allocated after decompose, since decompose could create temps */
+       if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
+               mono_arch_allocate_vars (cfg);
+               if (cfg->exception_type)
+                       return cfg;
+       }
 
-#ifndef MONO_CROSS_COMPILE
-       mono_runtime_install_handlers ();
-#endif
-       mono_threads_install_cleanup (mini_thread_cleanup);
+       {
+               MonoBasicBlock *bb;
+               gboolean need_local_opts;
 
-#ifdef MONO_ARCH_HAVE_NOTIFY_PENDING_EXC
-       check_for_pending_exc = FALSE;
-       mono_threads_install_notify_pending_exc ((MonoThreadNotifyPendingExcFunc)mono_arch_notify_pending_exc);
-#endif
+               if (!cfg->globalra && !COMPILE_LLVM (cfg)) {
+                       mono_spill_global_vars (cfg, &need_local_opts);
 
-#define JIT_TRAMPOLINES_WORK
-#ifdef JIT_TRAMPOLINES_WORK
-       mono_install_compile_method (mono_jit_compile_method);
-       mono_install_free_method (mono_jit_free_method);
-       mono_install_trampoline (mono_create_jit_trampoline);
-       mono_install_jump_trampoline (mono_create_jump_trampoline);
-#ifndef DISABLE_REMOTING
-       mono_install_remoting_trampoline (mono_jit_create_remoting_trampoline);
-#endif
-       mono_install_delegate_trampoline (mono_create_delegate_trampoline);
-       mono_install_create_domain_hook (mini_create_jit_domain_info);
-       mono_install_free_domain_hook (mini_free_jit_domain_info);
-#endif
-#define JIT_INVOKE_WORKS
-#ifdef JIT_INVOKE_WORKS
-       mono_install_runtime_invoke (mono_jit_runtime_invoke);
-#endif
-       mono_install_get_cached_class_info (mono_aot_get_cached_class_info);
-       mono_install_get_class_from_name (mono_aot_get_class_from_name);
-       mono_install_jit_info_find_in_aot (mono_aot_find_jit_info);
+                       if (need_local_opts || cfg->compile_aot) {
+                               /* To optimize code created by spill_global_vars */
+                               mono_local_cprop (cfg);
+                               if (cfg->opt & MONO_OPT_DEADCE)
+                                       mono_local_deadce (cfg);
+                       }
+               }
 
-       if (debug_options.collect_pagefault_stats)
-               mono_aot_set_make_unreadable (TRUE);
+               /* Add branches between non-consecutive bblocks */
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+                       if (bb->last_ins && MONO_IS_COND_BRANCH_OP (bb->last_ins) &&
+                               bb->last_ins->inst_false_bb && bb->next_bb != bb->last_ins->inst_false_bb) {
+                               /* we are careful when inverting, since bugs like #59580
+                                * could show up when dealing with NaNs.
+                                */
+                               if (MONO_IS_COND_BRANCH_NOFP(bb->last_ins) && bb->next_bb == bb->last_ins->inst_true_bb) {
+                                       MonoBasicBlock *tmp =  bb->last_ins->inst_true_bb;
+                                       bb->last_ins->inst_true_bb = bb->last_ins->inst_false_bb;
+                                       bb->last_ins->inst_false_bb = tmp;
 
-       if (runtime_version)
-               domain = mono_init_version (filename, runtime_version);
-       else
-               domain = mono_init_from_assembly (filename, filename);
+                                       bb->last_ins->opcode = mono_reverse_branch_op (bb->last_ins->opcode);
+                               } else {                        
+                                       MonoInst *inst = mono_mempool_alloc0 (cfg->mempool, sizeof (MonoInst));
+                                       inst->opcode = OP_BR;
+                                       inst->inst_target_bb = bb->last_ins->inst_false_bb;
+                                       mono_bblock_add_inst (bb, inst);
+                               }
+                       }
+               }
 
-       if (mono_aot_only) {
-               /* This helps catch code allocation requests */
-               mono_code_manager_set_read_only (domain->code_mp);
-               mono_marshal_use_aot_wrappers (TRUE);
-       }
+               if (cfg->verbose_level >= 4 && !cfg->globalra) {
+                       for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+                               MonoInst *tree = bb->code;      
+                               g_print ("DUMP BLOCK %d:\n", bb->block_num);
+                               if (!tree)
+                                       continue;
+                               for (; tree; tree = tree->next) {
+                                       mono_print_ins_index (-1, tree);
+                               }
+                       }
+               }
 
-       if (mono_use_imt) {
-               if (mono_aot_only)
-                       mono_install_imt_thunk_builder (mono_aot_get_imt_thunk);
-               else
-                       mono_install_imt_thunk_builder (mono_arch_build_imt_thunk);
+               /* FIXME: */
+               for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
+                       bb->max_vreg = cfg->next_vreg;
+               }
        }
 
-       /*Init arch tls information only after the metadata side is inited to make sure we see dynamic appdomain tls keys*/
-       mono_arch_finish_init ();
+       if (COMPILE_LLVM (cfg)) {
+#ifdef ENABLE_LLVM
+               char *nm;
 
-       mono_icall_init ();
+               /* The IR has to be in SSA form for LLVM */
+               if (!(cfg->comp_done & MONO_COMP_SSA)) {
+                       cfg->exception_message = g_strdup ("SSA disabled.");
+                       cfg->disable_llvm = TRUE;
+               }
 
-       /* This must come after mono_init () in the aot-only case */
-       mono_exceptions_init ();
+               if (cfg->flags & MONO_CFG_HAS_ARRAY_ACCESS)
+                       mono_decompose_array_access_opts (cfg);
 
-       /* This should come after mono_init () too */
-       mini_gc_init ();
+               if (!cfg->disable_llvm)
+                       mono_llvm_emit_method (cfg);
+               if (cfg->disable_llvm) {
+                       if (cfg->verbose_level >= 1) {
+                               //nm = mono_method_full_name (cfg->method, TRUE);
+                               printf ("LLVM failed for '%s': %s\n", method->name, cfg->exception_message);
+                               //g_free (nm);
+                       }
+                       mono_destroy_compile (cfg);
+                       try_llvm = FALSE;
+                       goto restart_compile;
+               }
 
-#ifndef DISABLE_JIT
-       mono_create_helper_signatures ();
+               if (cfg->verbose_level > 0 && !cfg->compile_aot) {
+                       nm = mono_method_full_name (cfg->method, TRUE);
+                       g_print ("LLVM Method %s emitted at %p to %p (code length %d) [%s]\n", 
+                                        nm, 
+                                        cfg->native_code, cfg->native_code + cfg->code_len, cfg->code_len, cfg->domain->friendly_name);
+                       g_free (nm);
+               }
 #endif
+       } else {
+               mono_codegen (cfg);
+       }
 
-       register_jit_stats ();
-
-#define JIT_CALLS_WORK
-#ifdef JIT_CALLS_WORK
-       /* Needs to be called here since register_jit_icall depends on it */
-       mono_marshal_init ();
-
-       jit_icall_name_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-       mono_arch_register_lowlevel_calls ();
-
-       register_icalls ();
-
-       mono_generic_sharing_init ();
-#endif
+       if (COMPILE_LLVM (cfg))
+               InterlockedIncrement (&mono_jit_stats.methods_with_llvm);
+       else
+               InterlockedIncrement (&mono_jit_stats.methods_without_llvm);
 
-#ifdef MONO_ARCH_SIMD_INTRINSICS
-       mono_simd_intrinsics_init ();
-#endif
+       cfg->jit_info = create_jit_info (cfg, method_to_compile);
 
-#if MONO_SUPPORT_TASKLETS
-       mono_tasklets_init ();
+#ifdef MONO_ARCH_HAVE_LIVERANGE_OPS
+       if (cfg->extend_live_ranges) {
+               /* Extend live ranges to cover the whole method */
+               for (i = 0; i < cfg->num_varinfo; ++i)
+                       MONO_VARINFO (cfg, i)->live_range_end = cfg->code_len;
+       }
 #endif
 
-       if (mono_compile_aot)
-               /*
-                * Avoid running managed code when AOT compiling, since the platform
-                * might only support aot-only execution.
-                */
-               mono_runtime_set_no_exec (TRUE);
+       if (!cfg->compile_aot)
+               mono_save_xdebug_info (cfg);
 
-#define JIT_RUNTIME_WORKS
-#ifdef JIT_RUNTIME_WORKS
-       mono_install_runtime_cleanup ((MonoDomainFunc)mini_cleanup);
-       mono_runtime_init (domain, mono_thread_start_cb, mono_thread_attach_cb);
-       mono_thread_attach (domain);
-#endif
+       mini_gc_create_gc_map (cfg);
+       mono_save_seq_point_info (cfg);
 
-       mono_profiler_runtime_initialized ();
+       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);
+       }
 
-       MONO_VES_INIT_END ();
+       if (!cfg->compile_aot) {
+               mono_domain_lock (cfg->domain);
+               mono_jit_info_table_add (cfg->domain, cfg->jit_info);
 
-       return domain;
-}
+               if (cfg->method->dynamic)
+                       mono_dynamic_code_hash_lookup (cfg->domain, cfg->method)->ji = cfg->jit_info;
+               mono_domain_unlock (cfg->domain);
+       }
 
-static void
-register_icalls (void)
-{
-       mono_add_internal_call ("System.Diagnostics.StackFrame::get_frame_info", 
-                               ves_icall_get_frame_info);
-       mono_add_internal_call ("System.Diagnostics.StackTrace::get_trace", 
-                               ves_icall_get_trace);
-       mono_add_internal_call ("System.Exception::get_trace", 
-                               ves_icall_System_Exception_get_trace);
-       mono_add_internal_call ("System.Security.SecurityFrame::_GetSecurityFrame",
-                               ves_icall_System_Security_SecurityFrame_GetSecurityFrame);
-       mono_add_internal_call ("System.Security.SecurityFrame::_GetSecurityStack",
-                               ves_icall_System_Security_SecurityFrame_GetSecurityStack);
-       mono_add_internal_call ("Mono.Runtime::mono_runtime_install_handlers", 
-                               mono_runtime_install_handlers);
-
-#if defined(PLATFORM_ANDROID) || defined(TARGET_ANDROID)
-       mono_add_internal_call ("System.Diagnostics.Debugger::Mono_UnhandledException_internal",
-                               mono_debugger_agent_unhandled_exception);
+#if 0
+       if (cfg->gsharedvt)
+               printf ("GSHAREDVT: %s\n", mono_method_full_name (cfg->method, TRUE));
 #endif
 
-       /*
-        * It's important that we pass `TRUE` as the last argument here, as
-        * it causes the JIT to omit a wrapper for these icalls. If the JIT
-        * *did* emit a wrapper, we'd be looking at infinite recursion since
-        * the wrapper would call the icall which would call the wrapper and
-        * so on.
-        */
-       register_icall (mono_profiler_method_enter, "mono_profiler_method_enter", "void ptr", TRUE);
-       register_icall (mono_profiler_method_leave, "mono_profiler_method_leave", "void ptr", TRUE);
-
-       register_icall (mono_trace_enter_method, "mono_trace_enter_method", NULL, TRUE);
-       register_icall (mono_trace_leave_method, "mono_trace_leave_method", NULL, TRUE);
-       register_icall (mono_get_lmf_addr, "mono_get_lmf_addr", "ptr", TRUE);
-       register_icall (mono_jit_thread_attach, "mono_jit_thread_attach", "ptr ptr", TRUE);
-       register_icall (mono_jit_set_domain, "mono_jit_set_domain", "void ptr", TRUE);
-       register_icall (mono_domain_get, "mono_domain_get", "ptr", TRUE);
-
-       register_dyn_icall (mono_get_throw_exception (), "mono_arch_throw_exception", "void object", TRUE);
-       register_dyn_icall (mono_get_rethrow_exception (), "mono_arch_rethrow_exception", "void object", TRUE);
-       register_dyn_icall (mono_get_throw_corlib_exception (), "mono_arch_throw_corlib_exception", "void ptr", TRUE);
-       register_icall (mono_thread_get_undeniable_exception, "mono_thread_get_undeniable_exception", "object", FALSE);
-       register_icall (mono_thread_interruption_checkpoint, "mono_thread_interruption_checkpoint", "void", FALSE);
-       register_icall (mono_thread_force_interruption_checkpoint, "mono_thread_force_interruption_checkpoint", "void", FALSE);
-#ifndef DISABLE_REMOTING
-       register_icall (mono_load_remote_field_new, "mono_load_remote_field_new", "object object ptr ptr", FALSE);
-       register_icall (mono_store_remote_field_new, "mono_store_remote_field_new", "void object ptr ptr object", FALSE);
+       /* collect statistics */
+#ifndef DISABLE_PERFCOUNTERS
+       mono_perfcounters->jit_methods++;
+       mono_perfcounters->jit_bytes += header->code_size;
 #endif
+       mono_jit_stats.allocated_code_size += cfg->code_len;
+       code_size_ratio = cfg->code_len;
+       if (code_size_ratio > mono_jit_stats.biggest_method_size && mono_jit_stats.enabled) {
+               mono_jit_stats.biggest_method_size = code_size_ratio;
+               g_free (mono_jit_stats.biggest_method);
+               mono_jit_stats.biggest_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
+       }
+       code_size_ratio = (code_size_ratio * 100) / header->code_size;
+       if (code_size_ratio > mono_jit_stats.max_code_size_ratio && mono_jit_stats.enabled) {
+               mono_jit_stats.max_code_size_ratio = code_size_ratio;
+               g_free (mono_jit_stats.max_ratio_method);
+               mono_jit_stats.max_ratio_method = g_strdup_printf ("%s::%s)", method->klass->name, method->name);
+       }
+       mono_jit_stats.native_code_size += cfg->code_len;
 
-#if defined(__native_client__) || defined(__native_client_codegen__)
-       register_icall (mono_nacl_gc, "mono_nacl_gc", "void", TRUE);
-#endif
-       /* 
-        * NOTE, NOTE, NOTE, NOTE:
-        * when adding emulation for some opcodes, remember to also add a dummy
-        * rule to the burg files, because we need the arity information to be correct.
-        */
-#ifndef MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS
-       register_opcode_emulation (OP_LMUL, "__emul_lmul", "long long long", mono_llmult, "mono_llmult", TRUE);
-       register_opcode_emulation (OP_LDIV, "__emul_ldiv", "long long long", mono_lldiv, "mono_lldiv", FALSE);
-       register_opcode_emulation (OP_LDIV_UN, "__emul_ldiv_un", "long long long", mono_lldiv_un, "mono_lldiv_un", FALSE);
-       register_opcode_emulation (OP_LREM, "__emul_lrem", "long long long", mono_llrem, "mono_llrem", FALSE);
-       register_opcode_emulation (OP_LREM_UN, "__emul_lrem_un", "long long long", mono_llrem_un, "mono_llrem_un", FALSE);
-#endif
-#if !defined(MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS) || defined(MONO_ARCH_EMULATE_LONG_MUL_OVF_OPTS)
-       register_opcode_emulation (OP_LMUL_OVF_UN, "__emul_lmul_ovf_un", "long long long", mono_llmult_ovf_un, "mono_llmult_ovf_un", FALSE);
-       register_opcode_emulation (OP_LMUL_OVF, "__emul_lmul_ovf", "long long long", mono_llmult_ovf, "mono_llmult_ovf", FALSE);
-#endif
+       if (MONO_METHOD_COMPILE_END_ENABLED ())
+               MONO_PROBE_METHOD_COMPILE_END (method, TRUE);
 
-#ifndef MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
-       register_opcode_emulation (OP_LSHL, "__emul_lshl", "long long int32", mono_lshl, "mono_lshl", TRUE);
-       register_opcode_emulation (OP_LSHR, "__emul_lshr", "long long int32", mono_lshr, "mono_lshr", TRUE);
-       register_opcode_emulation (OP_LSHR_UN, "__emul_lshr_un", "long long int32", mono_lshr_un, "mono_lshr_un", TRUE);
-#endif
+       return cfg;
+}
 
-#if defined(MONO_ARCH_EMULATE_MUL_DIV) || defined(MONO_ARCH_EMULATE_DIV)
-       register_opcode_emulation (OP_IDIV, "__emul_op_idiv", "int32 int32 int32", mono_idiv, "mono_idiv", FALSE);
-       register_opcode_emulation (OP_IDIV_UN, "__emul_op_idiv_un", "int32 int32 int32", mono_idiv_un, "mono_idiv_un", FALSE);
-       register_opcode_emulation (OP_IREM, "__emul_op_irem", "int32 int32 int32", mono_irem, "mono_irem", FALSE);
-       register_opcode_emulation (OP_IREM_UN, "__emul_op_irem_un", "int32 int32 int32", mono_irem_un, "mono_irem_un", FALSE);
-#endif
+#else
 
-#ifdef MONO_ARCH_EMULATE_MUL_DIV
-       register_opcode_emulation (OP_IMUL, "__emul_op_imul", "int32 int32 int32", mono_imul, "mono_imul", TRUE);
-#endif
+MonoCompile*
+mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFlags flags, int parts)
+{
+       g_assert_not_reached ();
+       return NULL;
+}
 
-#if defined(MONO_ARCH_EMULATE_MUL_DIV) || defined(MONO_ARCH_EMULATE_MUL_OVF)
-       register_opcode_emulation (OP_IMUL_OVF, "__emul_op_imul_ovf", "int32 int32 int32", mono_imul_ovf, "mono_imul_ovf", FALSE);
-       register_opcode_emulation (OP_IMUL_OVF_UN, "__emul_op_imul_ovf_un", "int32 int32 int32", mono_imul_ovf_un, "mono_imul_ovf_un", FALSE);
-#endif
+#endif /* DISABLE_JIT */
 
-#if defined(MONO_ARCH_EMULATE_MUL_DIV) || defined(MONO_ARCH_SOFT_FLOAT_FALLBACK)
-       if (ARCH_EMULATE_MUL_DIV || mono_arch_is_soft_float ()) {
-               register_opcode_emulation (OP_FDIV, "__emul_fdiv", "double double double", mono_fdiv, "mono_fdiv", FALSE);
-       }
-#endif
+gpointer
+mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, int opt, MonoException **jit_ex)
+{
+       MonoCompile *cfg;
+       gpointer code = NULL;
+       MonoJitInfo *jinfo, *info;
+       MonoVTable *vtable;
+       MonoException *ex = NULL;
+       guint32 prof_options;
+       GTimer *jit_timer;
+       MonoMethod *prof_method, *shared;
 
-       register_opcode_emulation (OP_FCONV_TO_U8, "__emul_fconv_to_u8", "ulong double", mono_fconv_u8, "mono_fconv_u8", FALSE);
-       register_opcode_emulation (OP_FCONV_TO_U4, "__emul_fconv_to_u4", "uint32 double", mono_fconv_u4, "mono_fconv_u4", FALSE);
-       register_opcode_emulation (OP_FCONV_TO_OVF_I8, "__emul_fconv_to_ovf_i8", "long double", mono_fconv_ovf_i8, "mono_fconv_ovf_i8", FALSE);
-       register_opcode_emulation (OP_FCONV_TO_OVF_U8, "__emul_fconv_to_ovf_u8", "ulong double", mono_fconv_ovf_u8, "mono_fconv_ovf_u8", FALSE);
+       if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+           (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
+               MonoMethod *nm;
+               MonoMethodPInvoke* piinfo = (MonoMethodPInvoke *) method;
 
-#ifdef MONO_ARCH_EMULATE_FCONV_TO_I8
-       register_opcode_emulation (OP_FCONV_TO_I8, "__emul_fconv_to_i8", "long double", mono_fconv_i8, "mono_fconv_i8", FALSE);
-#endif
-#ifdef MONO_ARCH_EMULATE_CONV_R8_UN
-       register_opcode_emulation (OP_ICONV_TO_R_UN, "__emul_iconv_to_r_un", "double int32", mono_conv_to_r8_un, "mono_conv_to_r8_un", FALSE);
-#endif
-#ifdef MONO_ARCH_EMULATE_LCONV_TO_R8
-       register_opcode_emulation (OP_LCONV_TO_R8, "__emul_lconv_to_r8", "double long", mono_lconv_to_r8, "mono_lconv_to_r8", FALSE);
-#endif
-#ifdef MONO_ARCH_EMULATE_LCONV_TO_R4
-       register_opcode_emulation (OP_LCONV_TO_R4, "__emul_lconv_to_r4", "float long", mono_lconv_to_r4, "mono_lconv_to_r4", FALSE);
-#endif
-#ifdef MONO_ARCH_EMULATE_LCONV_TO_R8_UN
-       register_opcode_emulation (OP_LCONV_TO_R_UN, "__emul_lconv_to_r8_un", "double long", mono_lconv_to_r8_un, "mono_lconv_to_r8_un", FALSE);
-#endif
-#ifdef MONO_ARCH_EMULATE_FREM
-#if defined(__default_codegen__)
-       register_opcode_emulation (OP_FREM, "__emul_frem", "double double double", fmod, "fmod", FALSE);
-#elif defined(__native_client_codegen__)
-       register_opcode_emulation (OP_FREM, "__emul_frem", "double double double", mono_fmod, "mono_fmod", FALSE);
-#endif
+               if (!piinfo->addr) {
+                       if (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
+                               piinfo->addr = mono_lookup_internal_call (method);
+                       else if (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)
+#ifdef HOST_WIN32
+                               g_warning ("Method '%s' in assembly '%s' contains native code that cannot be executed by Mono in modules loaded from byte arrays. The assembly was probably created using C++/CLI.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
+#else
+                               g_warning ("Method '%s' in assembly '%s' contains native code that cannot be executed by Mono on this platform. The assembly was probably created using C++/CLI.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
 #endif
+                       else
+                               mono_lookup_pinvoke_call (method, NULL, NULL);
+               }
+               nm = mono_marshal_get_native_wrapper (method, check_for_pending_exc, mono_aot_only);
+               code = mono_get_addr_from_ftnptr (mono_compile_method (nm));
+               jinfo = mono_jit_info_table_find (target_domain, code);
+               if (!jinfo)
+                       jinfo = mono_jit_info_table_find (mono_domain_get (), code);
+               if (jinfo)
+                       mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
+               return code;
+       } else if ((method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
+               const char *name = method->name;
+               char *full_name, *msg;
+               MonoMethod *nm;
 
-#ifdef MONO_ARCH_SOFT_FLOAT_FALLBACK
-       if (mono_arch_is_soft_float ()) {
-               register_opcode_emulation (OP_FSUB, "__emul_fsub", "double double double", mono_fsub, "mono_fsub", FALSE);
-               register_opcode_emulation (OP_FADD, "__emul_fadd", "double double double", mono_fadd, "mono_fadd", FALSE);
-               register_opcode_emulation (OP_FMUL, "__emul_fmul", "double double double", mono_fmul, "mono_fmul", FALSE);
-               register_opcode_emulation (OP_FNEG, "__emul_fneg", "double double", mono_fneg, "mono_fneg", FALSE);
-               register_opcode_emulation (OP_ICONV_TO_R8, "__emul_iconv_to_r8", "double int32", mono_conv_to_r8, "mono_conv_to_r8", FALSE);
-               register_opcode_emulation (OP_ICONV_TO_R4, "__emul_iconv_to_r4", "double int32", mono_conv_to_r4, "mono_conv_to_r4", FALSE);
-               register_opcode_emulation (OP_FCONV_TO_R4, "__emul_fconv_to_r4", "double double", mono_fconv_r4, "mono_fconv_r4", FALSE);
-               register_opcode_emulation (OP_FCONV_TO_I1, "__emul_fconv_to_i1", "int8 double", mono_fconv_i1, "mono_fconv_i1", FALSE);
-               register_opcode_emulation (OP_FCONV_TO_I2, "__emul_fconv_to_i2", "int16 double", mono_fconv_i2, "mono_fconv_i2", FALSE);
-               register_opcode_emulation (OP_FCONV_TO_I4, "__emul_fconv_to_i4", "int32 double", mono_fconv_i4, "mono_fconv_i4", FALSE);
-               register_opcode_emulation (OP_FCONV_TO_U1, "__emul_fconv_to_u1", "uint8 double", mono_fconv_u1, "mono_fconv_u1", FALSE);
-               register_opcode_emulation (OP_FCONV_TO_U2, "__emul_fconv_to_u2", "uint16 double", mono_fconv_u2, "mono_fconv_u2", FALSE);
-
-#if SIZEOF_VOID_P == 4
-               register_opcode_emulation (OP_FCONV_TO_I, "__emul_fconv_to_i", "int32 double", mono_fconv_i4, "mono_fconv_i4", FALSE);
+               if (method->klass->parent == mono_defaults.multicastdelegate_class) {
+                       if (*name == '.' && (strcmp (name, ".ctor") == 0)) {
+                               MonoJitICallInfo *mi = mono_find_jit_icall_by_name ("mono_delegate_ctor");
+                               g_assert (mi);
+                               /*
+                                * We need to make sure this wrapper
+                                * is compiled because it might end up
+                                * in an (M)RGCTX if generic sharing
+                                * is enabled, and would be called
+                                * indirectly.  If it were a
+                                * trampoline we'd try to patch that
+                                * indirect call, which is not
+                                * possible.
+                                */
+                               return mono_get_addr_from_ftnptr ((gpointer)mono_icall_get_wrapper_full (mi, TRUE));
+                       } else if (*name == 'I' && (strcmp (name, "Invoke") == 0)) {
+#ifdef MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
+                               return mono_create_delegate_trampoline (target_domain, method->klass);
+#else
+                               nm = mono_marshal_get_delegate_invoke (method, NULL);
+                               return mono_get_addr_from_ftnptr (mono_compile_method (nm));
 #endif
+                       } else if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0)) {
+                               nm = mono_marshal_get_delegate_begin_invoke (method);
+                               return mono_get_addr_from_ftnptr (mono_compile_method (nm));
+                       } else if (*name == 'E' && (strcmp (name, "EndInvoke") == 0)) {
+                               nm = mono_marshal_get_delegate_end_invoke (method);
+                               return mono_get_addr_from_ftnptr (mono_compile_method (nm));
+                       }
+               }
 
-               register_opcode_emulation (OP_FBEQ, "__emul_fcmp_eq", "uint32 double double", mono_fcmp_eq, "mono_fcmp_eq", FALSE);
-               register_opcode_emulation (OP_FBLT, "__emul_fcmp_lt", "uint32 double double", mono_fcmp_lt, "mono_fcmp_lt", FALSE);
-               register_opcode_emulation (OP_FBGT, "__emul_fcmp_gt", "uint32 double double", mono_fcmp_gt, "mono_fcmp_gt", FALSE);
-               register_opcode_emulation (OP_FBLE, "__emul_fcmp_le", "uint32 double double", mono_fcmp_le, "mono_fcmp_le", FALSE);
-               register_opcode_emulation (OP_FBGE, "__emul_fcmp_ge", "uint32 double double", mono_fcmp_ge, "mono_fcmp_ge", FALSE);
-               register_opcode_emulation (OP_FBNE_UN, "__emul_fcmp_ne_un", "uint32 double double", mono_fcmp_ne_un, "mono_fcmp_ne_un", FALSE);
-               register_opcode_emulation (OP_FBLT_UN, "__emul_fcmp_lt_un", "uint32 double double", mono_fcmp_lt_un, "mono_fcmp_lt_un", FALSE);
-               register_opcode_emulation (OP_FBGT_UN, "__emul_fcmp_gt_un", "uint32 double double", mono_fcmp_gt_un, "mono_fcmp_gt_un", FALSE);
-               register_opcode_emulation (OP_FBLE_UN, "__emul_fcmp_le_un", "uint32 double double", mono_fcmp_le_un, "mono_fcmp_le_un", FALSE);
-               register_opcode_emulation (OP_FBGE_UN, "__emul_fcmp_ge_un", "uint32 double double", mono_fcmp_ge_un, "mono_fcmp_ge_un", FALSE);
-
-               register_opcode_emulation (OP_FCEQ, "__emul_fcmp_ceq", "uint32 double double", mono_fceq, "mono_fceq", FALSE);
-               register_opcode_emulation (OP_FCGT, "__emul_fcmp_cgt", "uint32 double double", mono_fcgt, "mono_fcgt", FALSE);
-               register_opcode_emulation (OP_FCGT_UN, "__emul_fcmp_cgt_un", "uint32 double double", mono_fcgt_un, "mono_fcgt_un", FALSE);
-               register_opcode_emulation (OP_FCLT, "__emul_fcmp_clt", "uint32 double double", mono_fclt, "mono_fclt", FALSE);
-               register_opcode_emulation (OP_FCLT_UN, "__emul_fcmp_clt_un", "uint32 double double", mono_fclt_un, "mono_fclt_un", FALSE);
-
-               register_icall (mono_fload_r4, "mono_fload_r4", "double ptr", FALSE);
-               register_icall (mono_fstore_r4, "mono_fstore_r4", "void double ptr", FALSE);
-               register_icall (mono_fload_r4_arg, "mono_fload_r4_arg", "uint32 double", FALSE);
-               register_icall (mono_isfinite, "mono_isfinite", "uint32 double", FALSE);
+               full_name = mono_method_full_name (method, TRUE);
+               msg = g_strdup_printf ("Unrecognizable runtime implemented method '%s'", full_name);
+               *jit_ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "InvalidProgramException", msg);
+               g_free (full_name);
+               g_free (msg);
+               return NULL;
        }
-#endif
-
-#ifdef COMPRESSED_INTERFACE_BITMAP
-       register_icall (mono_class_interface_match, "mono_class_interface_match", "uint32 ptr int32", TRUE);
-#endif
-
-#if SIZEOF_REGISTER == 4
-       register_opcode_emulation (OP_FCONV_TO_U, "__emul_fconv_to_u", "uint32 double", mono_fconv_u4, "mono_fconv_u4", TRUE);
-#else
-       register_opcode_emulation (OP_FCONV_TO_U, "__emul_fconv_to_u", "ulong double", mono_fconv_u8, "mono_fconv_u8", TRUE);
-#endif
 
-       /* other jit icalls */
-       register_icall (mono_delegate_ctor, "mono_delegate_ctor", "void object object ptr", FALSE);
-       register_icall (mono_class_static_field_address , "mono_class_static_field_address", 
-                                "ptr ptr ptr", FALSE);
-       register_icall (mono_ldtoken_wrapper, "mono_ldtoken_wrapper", "ptr ptr ptr ptr", FALSE);
-       register_icall (mono_ldtoken_wrapper_generic_shared, "mono_ldtoken_wrapper_generic_shared",
-               "ptr ptr ptr ptr", FALSE);
-       register_icall (mono_get_special_static_data, "mono_get_special_static_data", "ptr int", FALSE);
-       register_icall (mono_ldstr, "mono_ldstr", "object ptr ptr int32", FALSE);
-       register_icall (mono_helper_stelem_ref_check, "mono_helper_stelem_ref_check", "void object object", FALSE);
-       register_icall (mono_object_new, "mono_object_new", "object ptr ptr", FALSE);
-       register_icall (mono_object_new_specific, "mono_object_new_specific", "object ptr", FALSE);
-       register_icall (mono_array_new, "mono_array_new", "object ptr ptr int32", FALSE);
-       register_icall (mono_array_new_specific, "mono_array_new_specific", "object ptr int32", FALSE);
-       register_icall (mono_runtime_class_init, "mono_runtime_class_init", "void ptr", FALSE);
-       register_icall (mono_ldftn, "mono_ldftn", "ptr ptr", FALSE);
-       register_icall (mono_ldvirtfn, "mono_ldvirtfn", "ptr object ptr", FALSE);
-       register_icall (mono_ldvirtfn_gshared, "mono_ldvirtfn_gshared", "ptr object ptr", FALSE);
-       register_icall (mono_helper_compile_generic_method, "mono_helper_compile_generic_method", "ptr object ptr ptr", FALSE);
-       register_icall (mono_helper_ldstr, "mono_helper_ldstr", "object ptr int", FALSE);
-       register_icall (mono_helper_ldstr_mscorlib, "mono_helper_ldstr_mscorlib", "object int", FALSE);
-       register_icall (mono_helper_newobj_mscorlib, "mono_helper_newobj_mscorlib", "object int", FALSE);
-       register_icall (mono_value_copy, "mono_value_copy", "void ptr ptr ptr", FALSE);
-       register_icall (mono_object_castclass_unbox, "mono_object_castclass_unbox", "object object ptr", FALSE);
-       register_icall (mono_break, "mono_break", NULL, TRUE);
-       register_icall (mono_create_corlib_exception_0, "mono_create_corlib_exception_0", "object int", TRUE);
-       register_icall (mono_create_corlib_exception_1, "mono_create_corlib_exception_1", "object int object", TRUE);
-       register_icall (mono_create_corlib_exception_2, "mono_create_corlib_exception_2", "object int object object", TRUE);
-       register_icall (mono_array_new_1, "mono_array_new_1", "object ptr int", FALSE);
-       register_icall (mono_array_new_2, "mono_array_new_2", "object ptr int int", FALSE);
-       register_icall (mono_array_new_3, "mono_array_new_3", "object ptr int int int", FALSE);
-       register_icall (mono_array_new_4, "mono_array_new_4", "object ptr int int int int", FALSE);
-       register_icall (mono_get_native_calli_wrapper, "mono_get_native_calli_wrapper", "ptr ptr ptr ptr", FALSE);
-       register_icall (mono_resume_unwind, "mono_resume_unwind", "void", TRUE);
-       register_icall (mono_gsharedvt_constrained_call, "mono_gsharedvt_constrained_call", "object ptr ptr ptr ptr ptr", FALSE);
-       register_icall (mono_gsharedvt_value_copy, "mono_gsharedvt_value_copy", "void ptr ptr ptr", TRUE);
-
-       register_icall (mono_gc_wbarrier_value_copy_bitmap, "mono_gc_wbarrier_value_copy_bitmap", "void ptr ptr int int", FALSE);
-
-       register_icall (mono_object_castclass_with_cache, "mono_object_castclass_with_cache", "object object ptr ptr", FALSE);
-       register_icall (mono_object_isinst_with_cache, "mono_object_isinst_with_cache", "object object ptr ptr", FALSE);
-
-       register_icall (mono_debugger_agent_user_break, "mono_debugger_agent_user_break", "void", FALSE);
-
-#ifdef TARGET_IOS
-       register_icall (pthread_getspecific, "pthread_getspecific", "ptr ptr", TRUE);
-#endif
-}
+       if (method->wrapper_type == MONO_WRAPPER_UNKNOWN) {
+               WrapperInfo *info = mono_marshal_get_wrapper_info (method);
 
-MonoJitStats mono_jit_stats = {0};
+               if (info->subtype == WRAPPER_SUBTYPE_GSHAREDVT_IN || info->subtype == WRAPPER_SUBTYPE_GSHAREDVT_OUT) {
+                       static MonoTrampInfo *in_tinfo, *out_tinfo;
+                       MonoTrampInfo *tinfo;
+                       MonoJitInfo *jinfo;
+                       gboolean is_in = info->subtype == WRAPPER_SUBTYPE_GSHAREDVT_IN;
 
-static void 
-print_jit_stats (void)
-{
-       if (mono_jit_stats.enabled) {
-               g_print ("Mono Jit statistics\n");
-               g_print ("Max code size ratio:    %.2f (%s)\n", mono_jit_stats.max_code_size_ratio/100.0,
-                                mono_jit_stats.max_ratio_method);
-               g_print ("Biggest method:         %ld (%s)\n", mono_jit_stats.biggest_method_size,
-                                mono_jit_stats.biggest_method);
-
-               g_print ("Delegates created:      %ld\n", mono_stats.delegate_creations);
-               g_print ("Initialized classes:    %ld\n", mono_stats.initialized_class_count);
-               g_print ("Used classes:           %ld\n", mono_stats.used_class_count);
-               g_print ("Generic vtables:        %ld\n", mono_stats.generic_vtable_count);
-               g_print ("Methods:                %ld\n", mono_stats.method_count);
-               g_print ("Static data size:       %ld\n", mono_stats.class_static_data_size);
-               g_print ("VTable data size:       %ld\n", mono_stats.class_vtable_size);
-               g_print ("Mscorlib mempool size:  %d\n", mono_mempool_get_allocated (mono_defaults.corlib->mempool));
-
-               g_print ("\nInitialized classes:    %ld\n", mono_stats.generic_class_count);
-               g_print ("Inflated types:         %ld\n", mono_stats.inflated_type_count);
-               g_print ("Generics virtual invokes: %ld\n", mono_jit_stats.generic_virtual_invocations);
-
-               g_print ("Sharable generic methods: %ld\n", mono_stats.generics_sharable_methods);
-               g_print ("Unsharable generic methods: %ld\n", mono_stats.generics_unsharable_methods);
-               g_print ("Shared generic methods: %ld\n", mono_stats.generics_shared_methods);
-               g_print ("Shared vtype generic methods: %ld\n", mono_stats.gsharedvt_methods);
-
-               g_print ("IMT tables size:        %ld\n", mono_stats.imt_tables_size);
-               g_print ("IMT number of tables:   %ld\n", mono_stats.imt_number_of_tables);
-               g_print ("IMT number of methods:  %ld\n", mono_stats.imt_number_of_methods);
-               g_print ("IMT used slots:         %ld\n", mono_stats.imt_used_slots);
-               g_print ("IMT colliding slots:    %ld\n", mono_stats.imt_slots_with_collisions);
-               g_print ("IMT max collisions:     %ld\n", mono_stats.imt_max_collisions_in_slot);
-               g_print ("IMT methods at max col: %ld\n", mono_stats.imt_method_count_when_max_collisions);
-               g_print ("IMT thunks size:        %ld\n", mono_stats.imt_thunks_size);
-
-               g_print ("JIT info table inserts: %ld\n", mono_stats.jit_info_table_insert_count);
-               g_print ("JIT info table removes: %ld\n", mono_stats.jit_info_table_remove_count);
-               g_print ("JIT info table lookups: %ld\n", mono_stats.jit_info_table_lookup_count);
-
-               if (mono_security_cas_enabled ()) {
-                       g_print ("\nDecl security check   : %ld\n", mono_jit_stats.cas_declsec_check);
-                       g_print ("LinkDemand (user)     : %ld\n", mono_jit_stats.cas_linkdemand);
-                       g_print ("LinkDemand (icall)    : %ld\n", mono_jit_stats.cas_linkdemand_icall);
-                       g_print ("LinkDemand (pinvoke)  : %ld\n", mono_jit_stats.cas_linkdemand_pinvoke);
-                       g_print ("LinkDemand (aptc)     : %ld\n", mono_jit_stats.cas_linkdemand_aptc);
-                       g_print ("Demand (code gen)     : %ld\n", mono_jit_stats.cas_demand_generation);
-               }
+                       if (is_in && in_tinfo)
+                               return in_tinfo->code;
+                       else if (!is_in && out_tinfo)
+                               return out_tinfo->code;
 
-               g_free (mono_jit_stats.max_ratio_method);
-               mono_jit_stats.max_ratio_method = NULL;
-               g_free (mono_jit_stats.biggest_method);
-               mono_jit_stats.biggest_method = NULL;
+                       /*
+                        * This is a special wrapper whose body is implemented in assembly, like a trampoline. We use a wrapper so EH
+                        * works.
+                        * FIXME: The caller signature doesn't match the callee, which might cause problems on some platforms
+                        */
+                       if (mono_aot_only)
+                               mono_aot_get_trampoline_full (is_in ? "gsharedvt_trampoline" : "gsharedvt_out_trampoline", &tinfo);
+                       else
+                               mono_arch_get_gsharedvt_trampoline (&tinfo, FALSE);
+                       jinfo = create_jit_info_for_trampoline (method, tinfo);
+                       mono_jit_info_table_add (mono_get_root_domain (), jinfo);
+                       if (is_in)
+                               in_tinfo = tinfo;
+                       else
+                               out_tinfo = tinfo;
+                       return tinfo->code;
+               }
        }
-}
-
-void
-mini_cleanup (MonoDomain *domain)
-{
-       mono_runtime_shutdown_stat_profiler ();
-       
-#ifndef DISABLE_COM
-       cominterop_release_all_rcws ();
-#endif
 
-#ifndef MONO_CROSS_COMPILE     
-       /* 
-        * mono_domain_finalize () needs to be called early since it needs the
-        * execution engine still fully working (it may invoke managed finalizers).
-        */
-       mono_domain_finalize (domain, 2000);
-#endif
+       if (mono_aot_only) {
+               char *fullname = mono_method_full_name (method, TRUE);
+               char *msg = g_strdup_printf ("Attempting to JIT compile method '%s' while running with --aot-only. See http://docs.xamarin.com/ios/about/limitations for more information.\n", fullname);
 
-       /* This accesses metadata so needs to be called before runtime shutdown */
-       print_jit_stats ();
+               *jit_ex = mono_get_exception_execution_engine (msg);
+               g_free (fullname);
+               g_free (msg);
+               
+               return NULL;
+       }
 
-       mono_profiler_shutdown ();
+       jit_timer = g_timer_new ();
 
-#ifndef MONO_CROSS_COMPILE
-       mono_runtime_cleanup (domain);
-#endif
+       cfg = mini_method_compile (method, opt, target_domain, JIT_FLAG_RUN_CCTORS, 0);
+       prof_method = cfg->method;
 
-       free_jit_tls_data (mono_native_tls_get_value (mono_jit_tls_id));
+       g_timer_stop (jit_timer);
+       mono_jit_stats.jit_time += g_timer_elapsed (jit_timer, NULL);
+       g_timer_destroy (jit_timer);
 
-       mono_icall_cleanup ();
+       switch (cfg->exception_type) {
+       case MONO_EXCEPTION_NONE:
+               break;
+       case MONO_EXCEPTION_TYPE_LOAD:
+       case MONO_EXCEPTION_MISSING_FIELD:
+       case MONO_EXCEPTION_MISSING_METHOD:
+       case MONO_EXCEPTION_FILE_NOT_FOUND:
+       case MONO_EXCEPTION_BAD_IMAGE: {
+               /* Throw a type load exception if needed */
+               MonoLoaderError *error = mono_loader_get_last_error ();
 
-       mono_runtime_cleanup_handlers ();
+               if (error) {
+                       ex = mono_loader_error_prepare_exception (error);
+               } else {
+                       if (cfg->exception_ptr) {
+                               ex = mono_class_get_exception_for_failure (cfg->exception_ptr);
+                       } else {
+                               if (cfg->exception_type == MONO_EXCEPTION_MISSING_FIELD)
+                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingFieldException", cfg->exception_message);
+                               else if (cfg->exception_type == MONO_EXCEPTION_MISSING_METHOD)
+                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MissingMethodException", cfg->exception_message);
+                               else if (cfg->exception_type == MONO_EXCEPTION_TYPE_LOAD)
+                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "TypeLoadException", cfg->exception_message);
+                               else if (cfg->exception_type == MONO_EXCEPTION_FILE_NOT_FOUND)
+                                       ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FileNotFoundException", cfg->exception_message);
+                               else if (cfg->exception_type == MONO_EXCEPTION_BAD_IMAGE)
+                                       ex = mono_get_exception_bad_image_format (cfg->exception_message);
+                               else
+                                       g_assert_not_reached ();
+                       }
+               }
+               break;
+       }
+       case MONO_EXCEPTION_INVALID_PROGRAM:
+               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "InvalidProgramException", cfg->exception_message);
+               break;
+       case MONO_EXCEPTION_UNVERIFIABLE_IL:
+               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System.Security", "VerificationException", cfg->exception_message);
+               break;
+       case MONO_EXCEPTION_METHOD_ACCESS:
+               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "MethodAccessException", cfg->exception_message);
+               break;
+       case MONO_EXCEPTION_FIELD_ACCESS:
+               ex = mono_exception_from_name_msg (mono_defaults.corlib, "System", "FieldAccessException", cfg->exception_message);
+               break;
+#ifndef DISABLE_SECURITY
+       /* this can only be set if the security manager is active */
+       case MONO_EXCEPTION_SECURITY_LINKDEMAND: {
+               MonoSecurityManager* secman = mono_security_manager_get_methods ();
+               MonoObject *exc = NULL;
+               gpointer args [2];
 
-#ifndef MONO_CROSS_COMPILE
-       mono_domain_free (domain, TRUE);
-#endif
+               args [0] = &cfg->exception_data;
+               args [1] = &method;
+               mono_runtime_invoke (secman->linkdemandsecurityexception, NULL, args, &exc);
 
-#ifdef ENABLE_LLVM
-       if (mono_use_llvm)
-               mono_llvm_cleanup ();
+               ex = (MonoException*)exc;
+               break;
+       }
 #endif
+       case MONO_EXCEPTION_OBJECT_SUPPLIED: {
+               MonoException *exp = cfg->exception_ptr;
+               MONO_GC_UNREGISTER_ROOT (cfg->exception_ptr);
 
-       mono_aot_cleanup ();
+               ex = exp;
+               break;
+       }
+       case MONO_EXCEPTION_OUT_OF_MEMORY:
+               ex = mono_domain_get ()->out_of_memory_ex;
+               break;
+       case MONO_EXCEPTION_MONO_ERROR:
+               g_assert (!mono_error_ok (&cfg->error));
+               ex = mono_error_convert_to_exception (&cfg->error);
+               break;
+       default:
+               g_assert_not_reached ();
+       }
 
-       mono_trampolines_cleanup ();
+       if (ex) {
+               if (cfg->prof_options & MONO_PROFILE_JIT_COMPILATION)
+                       mono_profiler_method_end_jit (method, NULL, MONO_PROFILE_FAILED);
 
-       mono_unwind_cleanup ();
+               mono_destroy_compile (cfg);
+               *jit_ex = ex;
 
-       mono_code_manager_destroy (global_codeman);
-       g_hash_table_destroy (jit_icall_name_hash);
-       g_free (emul_opcode_map);
-       g_free (emul_opcode_opcodes);
-       g_free (vtable_trampolines);
+               return NULL;
+       }
 
-       mono_tramp_info_cleanup ();
+       if (mono_method_is_generic_sharable (method, FALSE))
+               shared = mini_get_shared_method (method);
+       else
+               shared = NULL;
 
-       mono_arch_cleanup ();
+       mono_domain_lock (target_domain);
 
-       mono_generic_sharing_cleanup ();
+       /* Check if some other thread already did the job. In this case, we can
+       discard the code this thread generated. */
 
-       mono_cleanup ();
+       info = mini_lookup_method (target_domain, method, shared);
+       if (info) {
+               /* We can't use a domain specific method in another domain */
+               if ((target_domain == mono_domain_get ()) || info->domain_neutral) {
+                       code = info->code_start;
+//                     printf("Discarding code for method %s\n", method->name);
+               }
+       }
+       if (code == NULL) {
+               /* The lookup + insert is atomic since this is done inside the domain lock */
+               mono_domain_jit_code_hash_lock (target_domain);
+               mono_internal_hash_table_insert (&target_domain->jit_code_hash, cfg->jit_info->d.method, cfg->jit_info);
+               mono_domain_jit_code_hash_unlock (target_domain);
 
-       mono_trace_cleanup ();
+               code = cfg->native_code;
 
-       mono_counters_dump (MONO_COUNTER_SECTION_MASK | MONO_COUNTER_MONOTONIC, stdout);
+               if (cfg->generic_sharing_context && mono_method_is_generic_sharable (method, FALSE))
+                       mono_stats.generics_shared_methods++;
+               if (cfg->gsharedvt)
+                       mono_stats.gsharedvt_methods++;
+       }
 
-       if (mono_inject_async_exc_method)
-               mono_method_desc_free (mono_inject_async_exc_method);
+       jinfo = cfg->jit_info;
 
-       mono_native_tls_free (mono_jit_tls_id);
+       prof_options = cfg->prof_options;
 
-       mono_mutex_destroy (&jit_mutex);
+       /*
+        * Update global stats while holding a lock, instead of doing many
+        * InterlockedIncrement operations during JITting.
+        */
+       mono_jit_stats.allocate_var += cfg->stat_allocate_var;
+       mono_jit_stats.locals_stack_size += cfg->stat_locals_stack_size;
+       mono_jit_stats.basic_blocks += cfg->stat_basic_blocks;
+       mono_jit_stats.max_basic_blocks = MAX (cfg->stat_basic_blocks, mono_jit_stats.max_basic_blocks);
+       mono_jit_stats.cil_code_size += cfg->stat_cil_code_size;
+       mono_jit_stats.regvars += cfg->stat_n_regvars;
+       mono_jit_stats.inlineable_methods += cfg->stat_inlineable_methods;
+       mono_jit_stats.inlined_methods += cfg->stat_inlined_methods;
+       mono_jit_stats.cas_demand_generation += cfg->stat_cas_demand_generation;
+       mono_jit_stats.code_reallocs += cfg->stat_code_reallocs;
 
-       mono_mutex_destroy (&mono_delegate_section);
+       mono_destroy_compile (cfg);
 
-       mono_code_manager_cleanup ();
+#ifndef DISABLE_JIT
+       if (domain_jit_info (target_domain)->jump_target_hash) {
+               MonoJumpInfo patch_info;
+               MonoJumpList *jlist;
+               GSList *tmp;
+               jlist = g_hash_table_lookup (domain_jit_info (target_domain)->jump_target_hash, method);
+               if (jlist) {
+                       patch_info.next = NULL;
+                       patch_info.ip.i = 0;
+                       patch_info.type = MONO_PATCH_INFO_METHOD_JUMP;
+                       patch_info.data.method = method;
+                       g_hash_table_remove (domain_jit_info (target_domain)->jump_target_hash, method);
 
-#ifdef USE_JUMP_TABLES
-       mono_jumptable_cleanup ();
+#if defined(__native_client_codegen__) && defined(__native_client__)
+                       /* These patches are applied after a method has been installed, no target munging is needed. */
+                       nacl_allow_target_modification (FALSE);
 #endif
-}
-
-void
-mono_set_defaults (int verbose_level, guint32 opts)
-{
-       mini_verbose = verbose_level;
-       mono_set_optimizations (opts);
-}
-
-void
-mono_disable_optimizations (guint32 opts)
-{
-       default_opt &= ~opts;
-}
-
-void
-mono_set_optimizations (guint32 opts)
-{
-       default_opt = opts;
-       default_opt_set = TRUE;
-#ifdef MONO_ARCH_GSHAREDVT_SUPPORTED
-       mono_set_generic_sharing_vt_supported (mono_aot_only || ((default_opt & MONO_OPT_GSHAREDVT) != 0));
+                       for (tmp = jlist->list; tmp; tmp = tmp->next)
+                               mono_arch_patch_code (NULL, target_domain, tmp->data, &patch_info, NULL, TRUE);
+#if defined(__native_client_codegen__) && defined(__native_client__)
+                       nacl_allow_target_modification (TRUE);
 #endif
-}
-
-void
-mono_set_verbose_level (guint32 level)
-{
-       mini_verbose = level;
-}
-
-/**
- * mono_get_runtime_build_info:
- *
- * Return the runtime version + build date in string format.
- * The returned string is owned by the caller. The returned string
- * format is "VERSION (FULL_VERSION BUILD_DATE)" and build date is optional.
- */
-char*
-mono_get_runtime_build_info (void)
-{
-       if (mono_build_date)
-               return g_strdup_printf ("%s (%s %s)", VERSION, FULL_VERSION, mono_build_date);
-       else
-               return g_strdup_printf ("%s (%s)", VERSION, FULL_VERSION);
-}
-
-static void
-mono_precompile_assembly (MonoAssembly *ass, void *user_data)
-{
-       GHashTable *assemblies = (GHashTable*)user_data;
-       MonoImage *image = mono_assembly_get_image (ass);
-       MonoMethod *method, *invoke;
-       int i, count = 0;
-
-       if (g_hash_table_lookup (assemblies, ass))
-               return;
-
-       g_hash_table_insert (assemblies, ass, ass);
+               }
+       }
 
-       if (mini_verbose > 0)
-               printf ("PRECOMPILE: %s.\n", mono_image_get_filename (image));
+       mono_emit_jit_map (jinfo);
+#endif
+       mono_domain_unlock (target_domain);
 
-       for (i = 0; i < mono_image_get_table_rows (image, MONO_TABLE_METHOD); ++i) {
-               method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
-               if (method->flags & METHOD_ATTRIBUTE_ABSTRACT)
-                       continue;
-               if (method->is_generic || method->klass->generic_container)
-                       continue;
+       vtable = mono_class_vtable (target_domain, method->klass);
+       if (!vtable) {
+               ex = mono_class_get_exception_for_failure (method->klass);
+               g_assert (ex);
+               *jit_ex = ex;
+               return NULL;
+       }
 
-               count++;
-               if (mini_verbose > 1) {
-                       char * desc = mono_method_full_name (method, TRUE);
-                       g_print ("Compiling %d %s\n", count, desc);
-                       g_free (desc);
-               }
-               mono_compile_method (method);
-               if (strcmp (method->name, "Finalize") == 0) {
-                       invoke = mono_marshal_get_runtime_invoke (method, FALSE);
-                       mono_compile_method (invoke);
+       if (prof_options & MONO_PROFILE_JIT_COMPILATION) {
+               if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE) {
+                       if (mono_marshal_method_from_wrapper (method)) {
+                               /* Native func wrappers have no method */
+                               /* The profiler doesn't know about wrappers, so pass the original icall method */
+                               mono_profiler_method_end_jit (mono_marshal_method_from_wrapper (method), jinfo, MONO_PROFILE_OK);
+                       }
                }
-#ifndef DISABLE_REMOTING
-               if (mono_class_is_marshalbyref (method->klass) && mono_method_signature (method)->hasthis) {
-                       invoke = mono_marshal_get_remoting_invoke_with_check (method);
-                       mono_compile_method (invoke);
+               mono_profiler_method_end_jit (method, jinfo, MONO_PROFILE_OK);
+               if (prof_method != method) {
+                       mono_profiler_method_end_jit (prof_method, jinfo, MONO_PROFILE_OK);
                }
-#endif
        }
 
-       /* Load and precompile referenced assemblies as well */
-       for (i = 0; i < mono_image_get_table_rows (image, MONO_TABLE_ASSEMBLYREF); ++i) {
-               mono_assembly_load_reference (image, i);
-               if (image->references [i])
-                       mono_precompile_assembly (image->references [i], assemblies);
+       ex = mono_runtime_class_init_full (vtable, FALSE);
+       if (ex) {
+               *jit_ex = ex;
+               return NULL;
        }
-}
-
-void mono_precompile_assemblies ()
-{
-       GHashTable *assemblies = g_hash_table_new (NULL, NULL);
-
-       mono_assembly_foreach ((GFunc)mono_precompile_assembly, assemblies);
-
-       g_hash_table_destroy (assemblies);
+       return code;
 }
 
 #ifndef DISABLE_JIT
@@ -8082,3 +4504,30 @@ mini_replace_type (MonoType *type)
        type = mono_type_get_underlying_type (type);
        return mini_native_type_replace_type (type);
 }
+
+/*
+ * mini_get_underlying_type:
+ *
+ *   Return the type the JIT will use during compilation.
+ * Handles: byref, enums, native types, generic sharing.
+ * For gsharedvt types, it will return the original VAR/MVAR.
+ */
+MonoType*
+mini_get_underlying_type (MonoCompile *cfg, MonoType *type)
+{
+       type = mini_type_get_underlying_type (cfg->generic_sharing_context, type);
+       return mini_native_type_replace_type (type);
+}
+
+void
+mini_jit_init (void)
+{
+       mono_mutex_init_recursive (&jit_mutex);
+}
+
+void
+mini_jit_cleanup (void)
+{
+       g_free (emul_opcode_map);
+       g_free (emul_opcode_opcodes);
+}