From 468cb7131b08c1e6d0c34daddf27c1df71902bbb Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Mon, 9 Mar 2015 19:37:40 -0400
Subject: [PATCH] fix #10444

---
 src/debuginfo.cpp | 2 +-
 src/task.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
index 3348364dd0e29..68d8b5a13bf7c 100644
--- a/src/debuginfo.cpp
+++ b/src/debuginfo.cpp
@@ -352,7 +352,7 @@ class JuliaJITEventListener: public JITEventListener
 #endif
             ObjectInfo tmp = {objfile, (size_t)Size
 #ifdef LLVM36
-                ,SectionAddr
+                ,(size_t)SectionAddr
 #endif
 #ifdef _OS_DARWIN_
                 ,strndup(sName.data(), sName.size())
diff --git a/src/task.c b/src/task.c
index 48f3f0ee1a93f..15de40c7d1c70 100644
--- a/src/task.c
+++ b/src/task.c
@@ -590,12 +590,13 @@ DLLEXPORT size_t rec_backtrace_ctx(ptrint_t *data, size_t maxsize, CONTEXT *Cont
     size_t n = 0;
     while (n < maxsize) {
 #ifndef _CPU_X86_64_
+        data[n++] = (intptr_t)stk.AddrPC.Offset;
         BOOL result = StackWalk64(MachineType, GetCurrentProcess(), hMainThread,
             &stk, Context, NULL, JuliaFunctionTableAccess64, JuliaGetModuleBase64, NULL);
         if (!result)
             break;
-        data[n++] = (intptr_t)stk.AddrPC.Offset;
 #else
+        data[n++] = (intptr_t)Context->Rip;
         DWORD64 ImageBase = JuliaGetModuleBase64(GetCurrentProcess(), Context->Rip);
         if (!ImageBase)
             break;
@@ -622,7 +623,6 @@ DLLEXPORT size_t rec_backtrace_ctx(ptrint_t *data, size_t maxsize, CONTEXT *Cont
         }
         if (!Context->Rip)
             break;
-        data[n++] = (intptr_t)Context->Rip;
 #endif
     }
 #if !defined(_CPU_X86_64_)