[LLVMLibUnwind] Update

L/LLVMLibUnwind/LLVMLibUnwind@18.1.7/build_tarballs.jl

@@ -0,0 +1,7 @@
+version = v"18.1.7"
+
+include("../common.jl")
+
+# Build the tarballs
+build_tarballs(ARGS, configure(version; experimental=true)...;
+ preferred_gcc_version=v"10", preferred_llvm_version=v"17", julia_compat="1.12")

L/LLVMLibUnwind/LLVMLibUnwind@18.1.7/bundled/patches/0001-unwind-prologue-epilogue.patch

@@ -0,0 +1 @@
+../../../[email protected]/bundled/patches/0001-unwind-prologue-epilogue.patch

L/LLVMLibUnwind/LLVMLibUnwind@18.1.7/bundled/patches/0002-force-dwarf.patch

@@ -0,0 +1,180 @@
+An updated version of this libosxunwind commit:
+
+Author: Keno Fischer <[email protected]>
+Date: Tue Aug 27 15:01:22 2013 -0400
+
+ Add option to step with DWARF
+
+---
+diff --git a/libunwind/include/libunwind.h b/libunwind/include/libunwind.h
+index b2dae8f..fc37afb 100644
+--- a/libunwind/include/libunwind.h
++++ b/libunwind/include/libunwind.h
+@@ -108,6 +108,7 @@ extern "C" {
+
+ extern int unw_getcontext(unw_context_t *) LIBUNWIND_AVAIL;
+ extern int unw_init_local(unw_cursor_t *, unw_context_t *) LIBUNWIND_AVAIL;
++extern int unw_init_local_dwarf(unw_cursor_t *, unw_context_t *) LIBUNWIND_AVAIL;
+ extern int unw_step(unw_cursor_t *) LIBUNWIND_AVAIL;
+ extern int unw_get_reg(unw_cursor_t *, unw_regnum_t, unw_word_t *) LIBUNWIND_AVAIL;
+ extern int unw_get_fpreg(unw_cursor_t *, unw_regnum_t, unw_fpreg_t *) LIBUNWIND_AVAIL;
+diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp
+index 7753936..26ca486 100644
+--- a/libunwind/src/UnwindCursor.hpp
++++ b/libunwind/src/UnwindCursor.hpp
+@@ -453,6 +453,9 @@ public:
+ virtual bool isSignalFrame() {
+ _LIBUNWIND_ABORT("isSignalFrame not implemented");
+ }
++ virtual void setForceDWARF(bool) {
++ _LIBUNWIND_ABORT("setForceDWARF not implemented");
++ }
+ virtual bool getFunctionName(char *, size_t, unw_word_t *) {
+ _LIBUNWIND_ABORT("getFunctionName not implemented");
+ }
+@@ -944,6 +947,7 @@ public:
+ virtual void getInfo(unw_proc_info_t *);
+ virtual void jumpto();
+ virtual bool isSignalFrame();
++ virtual void setForceDWARF(bool force);
+ virtual bool getFunctionName(char *buf, size_t len, unw_word_t *off);
+ virtual void setInfoBasedOnIPRegister(bool isReturnAddress = false);
+ virtual const char *getRegisterName(int num);
+@@ -1031,7 +1035,7 @@ private:
+ const UnwindInfoSections &sects);
+ int stepWithCompactEncoding(bool stage2 = false) {
+ #if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND)
+- if ( compactSaysUseDwarf() )
++ if ( _forceDwarf || compactSaysUseDwarf() )
+ return stepWithDwarfFDE(stage2);
+ #endif
+ R dummy;
+@@ -1317,13 +1321,14 @@ private:
+ #if defined(_LIBUNWIND_CHECK_LINUX_SIGRETURN)
+ bool _isSigReturn = false;
+ #endif
++ bool _forceDwarf;
+ };
+
+
+ template <typename A, typename R>
+ UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as)
+ : _addressSpace(as), _registers(context), _unwindInfoMissing(false),
+- _isSignalFrame(false) {
++ _isSignalFrame(false), _forceDwarf(false) {
+ static_assert((check_fit<UnwindCursor<A, R>, unw_cursor_t>::does_fit),
+ "UnwindCursor<> does not fit in unw_cursor_t");
+ static_assert((alignof(UnwindCursor<A, R>) <= alignof(unw_cursor_t)),
+@@ -1333,7 +1338,8 @@ UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as)
+
+ template <typename A, typename R>
+ UnwindCursor<A, R>::UnwindCursor(A &as, void *)
+- : _addressSpace(as), _unwindInfoMissing(false), _isSignalFrame(false) {
++ : _addressSpace(as), _unwindInfoMissing(false), _isSignalFrame(false),
++ _forceDwarf(false) {
+ memset(&_info, 0, sizeof(_info));
+ // FIXME
+ // fill in _registers from thread arg
+@@ -1396,6 +1402,10 @@ template <typename A, typename R> bool UnwindCursor<A, R>::isSignalFrame() {
+ return _isSignalFrame;
+ }
+
++template <typename A, typename R> void UnwindCursor<A, R>::setForceDWARF(bool force) {
++ _forceDwarf = force;
++}
++
+ #endif // defined(_LIBUNWIND_SUPPORT_SEH_UNWIND)
+
+ #if defined(_LIBUNWIND_ARM_EHABI)
+@@ -2611,7 +2621,12 @@ void UnwindCursor<A, R>::setInfoBasedOnIPRegister(bool isReturnAddress) {
+ // record that we have no unwind info.
+ if (_info.format == 0)
+ _unwindInfoMissing = true;
++ #if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND)
++ if (!(_forceDwarf || compactSaysUseDwarf(&dwarfOffset)))
++ return;
++ #else
+ return;
++ #endif
+ }
+ }
+ #endif // defined(_LIBUNWIND_SUPPORT_COMPACT_UNWIND)
+diff --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp
+index 217dde9..8e9a77a 100644
+--- a/libunwind/src/libunwind.cpp
++++ b/libunwind/src/libunwind.cpp
+@@ -86,6 +86,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor,
+ new (reinterpret_cast<UnwindCursor<LocalAddressSpace, REGISTER_KIND> *>(cursor))
+ UnwindCursor<LocalAddressSpace, REGISTER_KIND>(
+ context, LocalAddressSpace::sThisAddressSpace);
++ static_assert(sizeof(unw_cursor_t) >= sizeof(UnwindCursor<LocalAddressSpace,REGISTER_KIND>), "libunwind header outdated");
+ #undef REGISTER_KIND
+ AbstractUnwindCursor *co = (AbstractUnwindCursor *)cursor;
+ co->setInfoBasedOnIPRegister();
+@@ -109,6 +110,54 @@ _LIBUNWIND_HIDDEN int __unw_get_reg(unw_cursor_t *cursor, unw_regnum_t regNum,
+ }
+ _LIBUNWIND_WEAK_ALIAS(__unw_get_reg, unw_get_reg)
+
++_LIBUNWIND_HIDDEN int __unw_init_local_dwarf(unw_cursor_t *cursor,
++ unw_context_t *context) {
++ _LIBUNWIND_TRACE_API("__unw_init_local_dwarf(cursor=%p, context=%p)",
++ static_cast<void *>(cursor),
++ static_cast<void *>(context));
++#if defined(__i386__)
++# define REGISTER_KIND Registers_x86
++#elif defined(__x86_64__)
++# define REGISTER_KIND Registers_x86_64
++#elif defined(__powerpc64__)
++# define REGISTER_KIND Registers_ppc64
++#elif defined(__ppc__)
++# define REGISTER_KIND Registers_ppc
++#elif defined(__aarch64__)
++# define REGISTER_KIND Registers_arm64
++#elif defined(__arm__)
++# define REGISTER_KIND Registers_arm
++#elif defined(__or1k__)
++# define REGISTER_KIND Registers_or1k
++#elif defined(__hexagon__)
++# define REGISTER_KIND Registers_hexagon
++#elif defined(__mips__) && defined(_ABIO32) && _MIPS_SIM == _ABIO32
++# define REGISTER_KIND Registers_mips_o32
++#elif defined(__mips64)
++# define REGISTER_KIND Registers_mips_newabi
++#elif defined(__mips__)
++# warning The MIPS architecture is not supported with this ABI and environment!
++#elif defined(__sparc__)
++# define REGISTER_KIND Registers_sparc
++#elif defined(__riscv) && __riscv_xlen == 64
++# define REGISTER_KIND Registers_riscv
++#else
++# error Architecture not supported
++#endif
++ // Use "placement new" to allocate UnwindCursor in the cursor buffer.
++ new (reinterpret_cast<UnwindCursor<LocalAddressSpace, REGISTER_KIND> *>(cursor))
++ UnwindCursor<LocalAddressSpace, REGISTER_KIND>(
++ context, LocalAddressSpace::sThisAddressSpace);
++ static_assert(sizeof(unw_cursor_t) >= sizeof(UnwindCursor<LocalAddressSpace,REGISTER_KIND>), "libunwind header outdated");
++#undef REGISTER_KIND
++ AbstractUnwindCursor *co = (AbstractUnwindCursor *)cursor;
++ co->setForceDWARF(true);
++ co->setInfoBasedOnIPRegister();
++
++ return UNW_ESUCCESS;
++}
++_LIBUNWIND_WEAK_ALIAS(__unw_init_local_dwarf, unw_init_local_dwarf)
++
+ /// Set value of specified register at cursor position in stack frame.
+ _LIBUNWIND_HIDDEN int __unw_set_reg(unw_cursor_t *cursor, unw_regnum_t regNum,
+ unw_word_t value) {
+diff --git a/libunwind/src/libunwind_ext.h b/libunwind/src/libunwind_ext.h
+index 28db43a..c4f9767 100644
+--- a/libunwind/src/libunwind_ext.h
++++ b/libunwind/src/libunwind_ext.h
+@@ -25,6 +25,7 @@ extern "C" {
+
+ extern int __unw_getcontext(unw_context_t *);
+ extern int __unw_init_local(unw_cursor_t *, unw_context_t *);
++extern int __unw_init_local_dwarf(unw_cursor_t *, unw_context_t *);
+ extern int __unw_step(unw_cursor_t *);
+ extern int __unw_get_reg(unw_cursor_t *, unw_regnum_t, unw_word_t *);
+ extern int __unw_get_fpreg(unw_cursor_t *, unw_regnum_t, unw_fpreg_t *);

L/LLVMLibUnwind/LLVMLibUnwind@18.1.7/bundled/patches/0003-stdc-format-macros.patch

@@ -0,0 +1,10 @@
+--- a/libunwind/src/DwarfParser.hpp
++++ b/libunwind/src/DwarfParser.hpp
+@@ -12,6 +12,7 @@
+ #ifndef __DWARF_PARSER_HPP__
+ #define __DWARF_PARSER_HPP__
+
++#define __STDC_FORMAT_MACROS
+ #include <inttypes.h>
+ #include <stdint.h>
+ #include <stdio.h>

L/LLVMLibUnwind/common.jl

@@ -12,6 +12,7 @@ function configure(version; experimental::Bool=false)
  v"12.0.1" => "0bea6089518395ca65cf58b0a450716c5c99ce1f041079d3aa42d280ace15ca4",
  # llvm-project-*.src.tar.xz
  v"14.0.6" => "8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a",
+ v"18.1.7" => "74446ab6943f686391954cbda0d77ae92e8a60c432eff437b8666e121d748ec4",
  )
 
  # LLVM deprecated standalone builds for several projects, including libunwind, so