[sgen] Don't return unused thread count from stop/start world functions.

[mono.git] / mono / metadata / domain-internals.h

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index 7756adc7c9cf30d6e028a5e88ae5409856411bea..a5fc96dec612bcc55e66d709aff4f89e8cef9f67 100644 (file)
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -85,6 +85,11 @@ typedef struct {
        gpointer try_start;
        gpointer try_end;
        gpointer handler_start;
+       /*
+        * For LLVM compiled code, this is the index of the il clause
+        * associated with this handler.
+        */
+       int clause_index;
        union {
                MonoClass *catch_class;
                gpointer filter;
@@ -205,6 +210,7 @@ struct _MonoJitInfo {
                MonoMethod *method;
                MonoImage *image;
                gpointer aot_info;
+               gpointer tramp_info;
        } d;
        struct _MonoJitInfo *next_jit_code_hash;
        gpointer    code_start;
@@ -225,6 +231,11 @@ struct _MonoJitInfo {
        gboolean    async:1;
        gboolean    dbg_step_through:1;
        gboolean    dbg_non_user_code:1;
+       /*
+        * Whenever this jit info refers to a trampoline.
+        * d.tramp_info contains additional data in this case.
+        */
+       gboolean    is_trampoline:1;
 
        /* FIXME: Embed this after the structure later*/
        gpointer    gc_info; /* Currently only used by SGen */
@@ -680,7 +691,7 @@ void mono_reflection_cleanup_domain (MonoDomain *domain);
 
 void mono_assembly_cleanup_domain_bindings (guint32 domain_id);
 
-MonoJitInfo* mono_jit_info_table_find_internal (MonoDomain *domain, char *addr, gboolean try_aot);
+MonoJitInfo* mono_jit_info_table_find_internal (MonoDomain *domain, char *addr, gboolean try_aot, gboolean allow_trampolines);
 
 void mono_enable_debug_domain_unload (gboolean enable);