Fix some merge problems.

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 60eb9cf2c23c290c4c93c7a652fea1567a6f63f6..e8fb24a0c50f24e370de7804345f7326db01da3c 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -1913,7 +1913,7 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
        if (has_gc_map) {
                int map_size = decode_value (p, &p);
                /* The GC map requires 4 bytes of alignment */
-               while ((guint64)p % 4)
+               while ((guint64)(gsize)p % 4)
                        p ++;           
                jinfo->gc_info = p;
                p += map_size;

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 778ba2a8198eac9d3b40749c69a74ad61c6658c8..8dc193b6411311285341e2131332567a4944cda1 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -320,17 +320,14 @@ mono_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *re
  *
  *   A version of mono_find_jit_info which returns all data in the StackFrameInfo
  * structure.
-<<<<<<< HEAD
  * A note about frames of type FRAME_TYPE_MANAGED_TO_NATIVE:
  * - These frames are used to mark managed-to-native transitions, so CTX will refer to native
  * code, and new_ctx will refer to the last managed frame. The caller should unwind once more
  * to obtain the last managed frame.
-=======
  * If SAVE_LOCATIONS is not NULL, it should point to an array of size MONO_MAX_IREGS.
  * On return, it will be filled with the locations where callee saved registers are saved
  * by the current frame. This is returned outside of StackFrameInfo because it can be
  * quite large on some platforms.
->>>>>>> Implement precise scanning of registers by scanning the stack slots where they are saved.
  */
 gboolean
 mono_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls, 
@@ -356,14 +353,10 @@ mono_find_jit_info_ext (MonoDomain *domain, MonoJitTlsData *jit_tls,
        if (!target_domain)
                target_domain = domain;
 
-<<<<<<< HEAD
-       err = mono_arch_find_jit_info (target_domain, jit_tls, ji, ctx, new_ctx, lmf, frame);
-=======
        if (save_locations)
                memset (save_locations, 0, MONO_MAX_IREGS * sizeof (mgreg_t*));
 
-       err = mono_arch_find_jit_info_ext (target_domain, jit_tls, ji, ctx, new_ctx, lmf, save_locations, frame);
->>>>>>> Implement precise scanning of registers by scanning the stack slots where they are saved.
+       err = mono_arch_find_jit_info (target_domain, jit_tls, ji, ctx, new_ctx, lmf, save_locations, frame);
        if (!err)
                return FALSE;
 
@@ -725,12 +718,7 @@ mono_walk_stack (MonoJitStackWalk func, MonoDomain *domain, MonoContext *start_c
 
        while (MONO_CONTEXT_GET_SP (&ctx) < jit_tls->end_of_stack) {
                frame.lmf = lmf;
-<<<<<<< HEAD
-               res = mono_find_jit_info_ext (domain, jit_tls, NULL, &ctx, &new_ctx, NULL, &lmf, &frame);
-=======
-#ifdef MONO_ARCH_HAVE_FIND_JIT_INFO_EXT
                res = mono_find_jit_info_ext (domain, jit_tls, NULL, &ctx, &new_ctx, NULL, &lmf, NULL, &frame);
->>>>>>> Implement precise scanning of registers by scanning the stack slots where they are saved.
                if (!res)
                        return;
 
@@ -787,7 +775,7 @@ ves_icall_get_frame_info (gint32 skip, MonoBoolean need_file_info,
        new_ctx = ctx;
        do {
                ctx = new_ctx;
-               res = mono_find_jit_info_ext (domain, jit_tls, NULL, &ctx, &new_ctx, NULL, &lmf, &frame);
+               res = mono_find_jit_info_ext (domain, jit_tls, NULL, &ctx, &new_ctx, NULL, &lmf, NULL, &frame);
                if (!res)
                        return FALSE;
 
@@ -1511,7 +1499,7 @@ mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gpointer origina
                } else {
                        StackFrameInfo frame;
 
-                       unwind_res = mono_find_jit_info_ext (domain, jit_tls, NULL, ctx, &new_ctx, NULL, &lmf, &frame);
+                       unwind_res = mono_find_jit_info_ext (domain, jit_tls, NULL, ctx, &new_ctx, NULL, &lmf, NULL, &frame);
                        if (unwind_res) {
                                if (frame.type == FRAME_TYPE_DEBUGGER_INVOKE || frame.type == FRAME_TYPE_MANAGED_TO_NATIVE) {
                                        *ctx = new_ctx;

diff --git a/mono/mini/mini-gc.c b/mono/mini/mini-gc.c
index 8e1c6b0f8fc1b935461a344a9a3ab0b57592099f..de9d6532cbf75a18287c1de6202fff8094ef8ca0 100644 (file)
--- a/mono/mini/mini-gc.c
+++ b/mono/mini/mini-gc.c
@@ -699,13 +699,9 @@ conservative_pass (TlsData *tls, guint8 *stack_start, guint8 *stack_end)
 
                g_assert ((mgreg_t)stack_limit % sizeof (mgreg_t) == 0);
 
-#ifdef MONO_ARCH_HAVE_FIND_JIT_INFO_EXT
                res = mono_find_jit_info_ext (frame.domain ? frame.domain : mono_domain_get (), tls->jit_tls, NULL, &ctx, &new_ctx, NULL, &lmf, new_reg_locations, &frame);
                if (!res)
                        break;
-#else
-               break;
-#endif
 
                ji = frame.ji;