[jit] Fix EH on amd64 which got broken by d5a18ba292367e375d215ca2351cf1fa9b0a1d8e.

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 592969a5256e9f538531bc822d46d975140a3f88..98ebc58dd3cda1af8722ed9018cbf2c64798f6b4 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -606,12 +606,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
                /* Adjust IP */
                new_ctx->rip --;
 
-#ifndef MONO_AMD64_NO_PUSHES
-               /* Pop arguments off the stack */
-               if (ji->has_arch_eh_info)
-                       new_ctx->rsp += mono_jit_info_get_arch_eh_info (ji)->stack_size;
-#endif
-
                return TRUE;
        } else if (*lmf) {
                guint64 rip;

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 8a69db7f005571acf151d909bc8a5000ac38bec5..faa8cafd322ca0799265305188b82a852fe7921b 100755 (executable)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -1986,10 +1986,6 @@ mono_arch_create_vars (MonoCompile *cfg)
                        cfg->lmf_ir_mono_lmf = TRUE;
 #endif
        }
-
-#ifndef HOST_WIN32
-       cfg->arch_eh_jit_info = 1;
-#endif
 }
 
 static void