projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2001 from esdrubal/get_module_filename
[mono.git]
/
mono
/
mini
/
tasklets.c
diff --git
a/mono/mini/tasklets.c
b/mono/mini/tasklets.c
index 28e7644d29cf3ab2f77cb4d1acd16e612f454dc2..cdd2117aceacf51710bc8067e646a91657e0144c 100644
(file)
--- a/
mono/mini/tasklets.c
+++ b/
mono/mini/tasklets.c
@@
-20,7
+20,7
@@
internal_init (void)
if (keepalive_stacks)
return;
MONO_GC_REGISTER_ROOT_PINNING (keepalive_stacks);
if (keepalive_stacks)
return;
MONO_GC_REGISTER_ROOT_PINNING (keepalive_stacks);
- keepalive_stacks = mono_g_hash_table_new
(NULL, NULL
);
+ keepalive_stacks = mono_g_hash_table_new
_type (NULL, NULL, MONO_HASH_CONSERVATIVE_GC
);
}
static void*
}
static void*
@@
-69,7
+69,7
@@
continuation_mark_frame (MonoContinuation *cont)
ctx = new_ctx;
if (endloop)
break;
ctx = new_ctx;
if (endloop)
break;
- if (strcmp (jinfo_get_method (ji)->name, "Mark") == 0)
+ if (
!ji->is_trampoline &&
strcmp (jinfo_get_method (ji)->name, "Mark") == 0)
endloop = TRUE;
} while (1);
endloop = TRUE;
} while (1);