diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2015-08-20 22:13:07 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2015-08-20 22:13:07 +0300 |
| commit | 5921dd9a019b43d60817a2631c1b5abfb5fa0450 (patch) | |
| tree | 4485c7d379ab557114e6aea99107ccda97fec39d | |
| parent | 5ab4c0d099a69de2a2ef5d1cf8d83e78df4d6af8 (diff) | |
Backport/adjust 0061a4f02ecf9e073e5f82a6e5addb2398d96c88, 6caa50dedb98c62abe42132ae57f94f4b99e5340, for bug #32647mono-4.0.0-branch-c5sr4-32647
| -rw-r--r-- | mono/metadata/loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index 33cd384f434..18d61de1950 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -2372,7 +2372,7 @@ stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data) return FALSE; case FRAME_TYPE_MANAGED: g_assert (frame->ji); - return d->func (mono_jit_info_get_method (frame->ji), frame->native_offset, frame->il_offset, frame->managed, d->user_data); + return d->func (frame->actual_method, frame->native_offset, frame->il_offset, frame->managed, d->user_data); break; default: g_assert_not_reached (); @@ -2412,10 +2412,10 @@ async_stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer case FRAME_TYPE_MANAGED: if (!frame->ji) return FALSE; - if (frame->ji->async) + if (frame->ji->async){ return d->func (NULL, frame->domain, frame->ji->code_start, frame->native_offset, d->user_data); - else - return d->func (mono_jit_info_get_method (frame->ji), frame->domain, frame->ji->code_start, frame->native_offset, d->user_data); + } else + return d->func (frame->actual_method, frame->domain, frame->ji->code_start, frame->native_offset, d->user_data); break; default: g_assert_not_reached (); |