diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2018-02-01 17:48:48 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2018-02-01 17:48:48 +0300 |
| commit | 38502063cac0b9c258af2c59dce9cd2d0a12b4d1 (patch) | |
| tree | 523393098e569801cd6543a1c3d991bdbe29dfbe | |
| parent | 3c3e692887af323549aca938dd6d3dca7a9a6cc8 (diff) | |
Revert "[mini] Align stack when resuming to catch handler" (#6744)mono-5.8.0.123
This reverts commit ab20369d5f0b5cba4e7671f59eac36095cc18a18.
It breaks llvm EH : https://github.com/xamarin/xamarin-macios/issues/3241
| -rw-r--r-- | mono/mini/mini-exceptions.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c index a97945763c8..98dcf88fadf 100644 --- a/mono/mini/mini-exceptions.c +++ b/mono/mini/mini-exceptions.c @@ -2155,11 +2155,6 @@ mono_handle_exception_internal (MonoContext *ctx, MonoObject *obj, gboolean resu #endif } else { MONO_CONTEXT_SET_IP (ctx, ei->handler_start); - /* - * When the exception is thrown in async fashion, we can have the stack pointer - * unaligned. Make sure we resume to the catch handler with an aligned stack. - */ - MONO_CONTEXT_SET_SP (ctx, (mgreg_t)MONO_CONTEXT_GET_SP (ctx) & ~(MONO_ARCH_FRAME_ALIGNMENT - 1)); } mono_set_lmf (lmf); #ifndef DISABLE_PERFCOUNTERS |