git: 9185066430a0 - stable/12 - Temporarily disable libunwind's FrameHeaderCache, until there is a resolution for <https://bugs.llvm.org/show_bug.cgi?id=47181>.

The branch stable/12 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=9185066430a022a520dd8812dca34c8411c7e8aa

commit 9185066430a022a520dd8812dca34c8411c7e8aa
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2020-08-15 22:58:07 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-22 09:58:28 +0000

    Temporarily disable libunwind's FrameHeaderCache, until there is a
    resolution for <https://bugs.llvm.org/show_bug.cgi?id=47181>.
    
    The cache implementation depends on dl_iterate_phdr(3) ensuring that its
    callbacks are not called simultaneously for multiple threads, but that
    is only the case for the dl_iterate_phdr() implementation in rtld.
    
    In a statically linked executable, libc's dl_iterate_phdr() is used,
    which does no such locking. If multiple threads then call into the
    unwinder at the same time, it is possible to trigger a segfault.
    
    In particular, the statically linked lld which is built during the
    cross-tools stage can segfault in this way, because it starts multiple
    worker threads that can exit in parallel. Since our pthread_exit(3)
    invokes the unwinder, it will therefore call into it in parallel too.
    
    (cherry picked from commit 9ff1cc58cd72f7109ae728ca32935cf9e8ca8ced)
---
 contrib/llvm-project/libunwind/src/AddressSpace.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/llvm-project/libunwind/src/AddressSpace.hpp b/contrib/llvm-project/libunwind/src/AddressSpace.hpp
index a4564cb67328..d9d17ddb7bf4 100644
--- a/contrib/llvm-project/libunwind/src/AddressSpace.hpp
+++ b/contrib/llvm-project/libunwind/src/AddressSpace.hpp
@@ -452,10 +452,12 @@ struct _LIBUNWIND_HIDDEN dl_iterate_cb_data {
     #error "_LIBUNWIND_SUPPORT_DWARF_UNWIND requires _LIBUNWIND_SUPPORT_DWARF_INDEX on this platform."
   #endif
 
+#if defined(_LIBUNWIND_USE_FRAME_HEADER_CACHE)
 #include "FrameHeaderCache.hpp"
 
 // There should be just one of these per process.
 static FrameHeaderCache ProcessFrameHeaderCache;
+#endif // _LIBUNWIND_USE_FRAME_HEADER_CACHE
 
 static bool checkAddrInSegment(const Elf_Phdr *phdr, size_t image_base,
                                dl_iterate_cb_data *cbdata) {
@@ -476,8 +478,10 @@ int findUnwindSectionsByPhdr(struct dl_phdr_info *pinfo, size_t pinfo_size,
   auto cbdata = static_cast<dl_iterate_cb_data *>(data);
   if (pinfo->dlpi_phnum == 0 || cbdata->targetAddr < pinfo->dlpi_addr)
     return 0;
+#if defined(_LIBUNWIND_USE_FRAME_HEADER_CACHE)
   if (ProcessFrameHeaderCache.find(pinfo, pinfo_size, data))
     return 1;
+#endif // _LIBUNWIND_USE_FRAME_HEADER_CACHE
 
   Elf_Addr image_base = calculateImageBase(pinfo);
   bool found_obj = false;
@@ -505,7 +509,9 @@ int findUnwindSectionsByPhdr(struct dl_phdr_info *pinfo, size_t pinfo_size,
       found_obj = checkAddrInSegment(phdr, image_base, cbdata);
     }
     if (found_obj && found_hdr) {
+#if defined(_LIBUNWIND_USE_FRAME_HEADER_CACHE)
       ProcessFrameHeaderCache.add(cbdata->sects);
+#endif // _LIBUNWIND_USE_FRAME_HEADER_CACHE
       return 1;
     }
   }