From 38502063cac0b9c258af2c59dce9cd2d0a12b4d1 Mon Sep 17 00:00:00 2001 From: monojenkins Date: Thu, 1 Feb 2018 15:48:48 +0100 Subject: Revert "[mini] Align stack when resuming to catch handler" (#6744) This reverts commit ab20369d5f0b5cba4e7671f59eac36095cc18a18. It breaks llvm EH : https://github.com/xamarin/xamarin-macios/issues/3241 --- mono/mini/mini-exceptions.c | 5 ----- 1 file changed, 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 -- cgit v1.2.3