fixes

Author: JeffBezanson

cli/jl_exports.h

@@ -42,7 +42,7 @@ JL_CODEGEN_EXPORTED_FUNCS(XX)
 JL_RUNTIME_EXPORTED_FUNCS(XX)
 #ifdef _OS_WINDOWS_
 JL_RUNTIME_EXPORTED_FUNCS_WIN(XX)
-JL_HIDDEN anonfunc * __julia_personality_addr = NULL;
+JL_DLLEXPORT anonfunc * __julia_personality_addr = NULL;
 #endif
 JL_CODEGEN_EXPORTED_FUNCS(XX)
 #undef XX
@@ -57,7 +57,11 @@ static const char *const jl_runtime_exported_func_names[] = {
     JL_RUNTIME_EXPORTED_FUNCS(XX)
 #ifdef _OS_WINDOWS_
     JL_RUNTIME_EXPORTED_FUNCS_WIN(XX)
+#ifdef _WIN32
     "__julia_personality@16",
+#else
+    "__julia_personality",
+#endif
 #endif
     JL_RUNTIME_EXPORTED_FUNC_ADDRS(XX)
     NULL

src/debuginfo.cpp

@@ -342,7 +342,7 @@ class JuliaJITEventListener: public JITEventListener
                !memcmp(UnwindData, "\0\0\0\0\0\0\0\0\0\0\0\0", 12));
         catchjmp[0] = 0x48;
         catchjmp[1] = 0xb8; // mov RAX, QWORD PTR [&__julia_personality]
-        *(uint64_t*)(&catchjmp[2]) = (uint64_t)&__julia_personality;
+        *(uint64_t*)(&catchjmp[2]) = (uint64_t)__julia_personality_addr;
         catchjmp[10] = 0xff;
         catchjmp[11] = 0xe0; // jmp RAX
         UnwindData[0] = 0x09; // version info, UNW_FLAG_EHANDLER

src/jl_exported_funcs.inc

@@ -17,6 +17,7 @@
     XX(jl_apply_type) \
     XX(jl_apply_type1) \
     XX(jl_apply_type2) \
+    XX(jl_apply_modify_type) \
     XX(jl_argument_datatype) \
     XX(jl_argument_method_table) \
     XX(jl_array_cconvert_cstring) \
@@ -577,6 +578,7 @@
     XX(jl_dlfind_win32) \
     XX(jl_refresh_dbg_module_list)
 
+// exported functions whose addresses we need to use
 #define JL_RUNTIME_EXPORTED_FUNC_ADDRS(XX) \
     XX(jl_f_is) \
     XX(jl_f_typeof) \

src/julia_internal.h

@@ -949,8 +949,9 @@ typedef struct {
 uint64_t jl_getUnwindInfo(uint64_t dwBase);
 #ifdef _OS_WINDOWS_
 #include <dbghelp.h>
-JL_DLLEXPORT EXCEPTION_DISPOSITION __julia_personality(
+JL_DLLEXPORT EXCEPTION_DISPOSITION NTAPI __julia_personality(
         PEXCEPTION_RECORD ExceptionRecord, void *EstablisherFrame, PCONTEXT ContextRecord, void *DispatcherContext);
+JL_DLLIMPORT EXCEPTION_DISPOSITION (*__julia_personality_addr)(PEXCEPTION_RECORD, void*, PCONTEXT, void*);
 extern HANDLE hMainThread;
 typedef CONTEXT bt_context_t;
 #if defined(_CPU_X86_64_)