2008-01-14 Zoltan Varga <vargaz@gmail.com>

	* exceptions-amd64.c (mono_arch_find_jit_info): Remove some duplicate code.

svn path=/trunk/mono/; revision=92901

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index e04cb3cc343de1ffd65efb10f82875f3c9a23097..cc4c296a077543c0dd4d5d5a9f28cb4324d753e2 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,6 @@
+2008-01-14  Zoltan Varga  <vargaz@gmail.com>
+
+       * exceptions-amd64.c (mono_arch_find_jit_info): Remove some duplicate code.
 
 Mon Jan 14 12:33:06 CET 2008  David S. Miller  <davem@davemloft.net>
 

diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 7effa37454f16dae5ce0f0d96a6f3613860f4510..ed4ea063f6bcbe5a2f4048830ca485cec2a7acaf 100644 (file)
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -526,12 +526,12 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
        if (managed)
                *managed = FALSE;
 
+       *new_ctx = *ctx;
+
        if (ji != NULL) {
                int offset;
                gboolean omit_fp = (ji->used_regs & (1 << 31)) > 0;
 
-               *new_ctx = *ctx;
-
                if (managed)
                        if (!ji->method->wrapper_type)
                                *managed = TRUE;
@@ -641,9 +641,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInf
 
                return ji;
        } else if (*lmf) {
-               
-               *new_ctx = *ctx;
-
                if ((ji = mono_jit_info_table_find (domain, (gpointer)(*lmf)->rip))) {
                } else {
                        if (!(*lmf)->method)