[interp] move interp_init call so embedders don't have to call it explicitly
authorBernhard Urban <bernhard.urban@xamarin.com>
Tue, 25 Apr 2017 22:13:37 +0000 (00:13 +0200)
committerBernhard Urban <bernhard.urban@xamarin.com>
Fri, 28 Apr 2017 18:52:06 +0000 (20:52 +0200)
mono/mini/driver.c
mono/mini/mini-runtime.c

index 7b2d9ef53b81577e0c2dbb710581335ddacb275b..25d0833f9b27df1c0b85aaf0de69c627880314c4 100644 (file)
@@ -2063,9 +2063,6 @@ mono_main (int argc, char* argv[])
        }
 
        mono_set_defaults (mini_verbose, opt);
-#ifdef ENABLE_INTERPRETER
-       mono_interp_init ();
-#endif
        domain = mini_init (argv [i], forced_version);
 
        mono_gc_set_stack_end (&domain);
index 9efd7c34929b2b4f6766b183085e4852a9b83289..719dceaf97e39dbfe0b39739584e9c85dfc23c60 100644 (file)
@@ -3730,6 +3730,10 @@ mini_init (const char *filename, const char *runtime_version)
        }
 #endif
 
+#ifdef ENABLE_INTERPRETER
+       mono_interp_init ();
+#endif
+
        mono_os_mutex_init_recursive (&jit_mutex);
 
        mono_cross_helpers_run ();