projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9609a25
)
Fix a merge problem.
author
Zoltan Varga
<vargaz@gmail.com>
Fri, 12 Nov 2010 20:12:05 +0000
(21:12 +0100)
committer
Zoltan Varga
<vargaz@gmail.com>
Mon, 3 Jan 2011 14:42:43 +0000
(15:42 +0100)
mono/mini/debugger-agent.c
patch
|
blob
|
history
diff --git
a/mono/mini/debugger-agent.c
b/mono/mini/debugger-agent.c
index 24ca62837034cd7599c48987b0deb0328e8c5def..205eea1d15bffcde5aaf5133268d243db231d0b5 100644
(file)
--- a/
mono/mini/debugger-agent.c
+++ b/
mono/mini/debugger-agent.c
@@
-4209,7
+4209,7
@@
ss_create (MonoInternalThread *thread, StepSize size, StepDepth depth, EventRequ
*/
/* Find the the jit info for the catch context */
- res = mono_find_jit_info_ext (mono_domain_get (), thread->jit_data, NULL, &tls->catch_ctx, &new_ctx, NULL, &lmf, &frame);
+ res = mono_find_jit_info_ext (mono_domain_get (), thread->jit_data, NULL, &tls->catch_ctx, &new_ctx, NULL, &lmf,
NULL,
&frame);
g_assert (res);
g_assert (frame.type == FRAME_TYPE_MANAGED);