This is an archive of the discontinued LLVM Phabricator instance.

Differential D133453

[libunwind] Fix a few libunwind includes
AbandonedPublic

Authored by ldionne on Sep 7 2022, 2:29 PM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Summary

In UnwindCursor.hpp, include config.h before checking _LIBUNWIND_SUPPORT_SEH_UNWIND.

Include libunwind_ext.h for UNW_STEP_SUCCESS.

Diff Detail

Event Timeline

ldionne created this revision.Sep 7 2022, 2:29 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptSep 7 2022, 2:29 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
ldionne requested review of this revision.Sep 7 2022, 2:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 7 2022, 2:29 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
ldionne abandoned this revision.Sep 7 2022, 2:29 PM

Ugh crap, this was meant to update D86766.

Harbormaster completed remote builds in B185497: Diff 458562.Sep 7 2022, 4:57 PM

Revision Contents

PathSize
libunwind/
src/
1 line
5 lines
23 lines

Diff 458562

libunwind/src/CompactUnwinder.hpp

Show All 13 Lines
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <libunwind.h> #include <libunwind.h>
#include <mach-o/compact_unwind_encoding.h> #include <mach-o/compact_unwind_encoding.h>
#include "Registers.hpp" #include "Registers.hpp"
#include "libunwind_ext.h"
#define EXTRACT_BITS(value, mask) \ #define EXTRACT_BITS(value, mask) \
((value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask))) - 1)) ((value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask))) - 1))
namespace libunwind { namespace libunwind {
#if defined(_LIBUNWIND_TARGET_I386) #if defined(_LIBUNWIND_TARGET_I386)
/// CompactUnwinder_x86 uses a compact unwind info to virtually "step" (aka /// CompactUnwinder_x86 uses a compact unwind info to virtually "step" (aka
▲ Show 20 Lines • Show All 668 Lines • Show Last 20 Lines

libunwind/src/DwarfInstructions.hpp

Show All 10 Lines
#ifndef __DWARF_INSTRUCTIONS_HPP__ #ifndef __DWARF_INSTRUCTIONS_HPP__
#define __DWARF_INSTRUCTIONS_HPP__ #define __DWARF_INSTRUCTIONS_HPP__
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "dwarf2.h"
#include "Registers.hpp"
#include "DwarfParser.hpp" #include "DwarfParser.hpp"
#include "Registers.hpp"
#include "config.h" #include "config.h"
#include "dwarf2.h"
#include "libunwind_ext.h"
namespace libunwind { namespace libunwind {
/// DwarfInstructions maps abstract DWARF unwind instructions to a particular /// DwarfInstructions maps abstract DWARF unwind instructions to a particular
/// architecture /// architecture
template <typename A, typename R> template <typename A, typename R>
▲ Show 20 Lines • Show All 861 Lines • Show Last 20 Lines

libunwind/src/UnwindCursor.hpp

Show All 32 Lines
#if defined(_LIBUNWIND_TARGET_LINUX) && \ #if defined(_LIBUNWIND_TARGET_LINUX) && \
(defined(_LIBUNWIND_TARGET_AARCH64) || defined(_LIBUNWIND_TARGET_S390X)) (defined(_LIBUNWIND_TARGET_AARCH64) || defined(_LIBUNWIND_TARGET_S390X))
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <unistd.h> #include <unistd.h>
#define _LIBUNWIND_CHECK_LINUX_SIGRETURN 1 #define _LIBUNWIND_CHECK_LINUX_SIGRETURN 1
#endif #endif
#include "AddressSpace.hpp"
#include "CompactUnwinder.hpp"
#include "config.h"
#include "DwarfInstructions.hpp"
#include "EHHeaderParser.hpp"
#include "libunwind.h"
#include "libunwind_ext.h"
#include "Registers.hpp"
#include "RWMutex.hpp"
#include "Unwind-EHABI.h"
#if defined(_LIBUNWIND_SUPPORT_SEH_UNWIND) #if defined(_LIBUNWIND_SUPPORT_SEH_UNWIND)
// Provide a definition for the DISPATCHER_CONTEXT struct for old (Win7 and // Provide a definition for the DISPATCHER_CONTEXT struct for old (Win7 and
// earlier) SDKs. // earlier) SDKs.
// MinGW-w64 has always provided this struct. // MinGW-w64 has always provided this struct.
#if defined(_WIN32) && defined(_LIBUNWIND_TARGET_X86_64) && \ #if defined(_WIN32) && defined(_LIBUNWIND_TARGET_X86_64) && \
!defined(__MINGW32__) && VER_PRODUCTBUILD < 8000 !defined(__MINGW32__) && VER_PRODUCTBUILD < 8000
struct _DISPATCHER_CONTEXT { struct _DISPATCHER_CONTEXT {
ULONG64 ControlPc; ULONG64 ControlPc;
Show All 21 Lines
}; };
extern "C" _Unwind_Reason_Code __libunwind_seh_personality( extern "C" _Unwind_Reason_Code __libunwind_seh_personality(
int, _Unwind_Action, uint64_t, _Unwind_Exception *, int, _Unwind_Action, uint64_t, _Unwind_Exception *,
struct _Unwind_Context *); struct _Unwind_Context *);
#endif #endif
#include "config.h"
#include "AddressSpace.hpp"
#include "CompactUnwinder.hpp"
#include "config.h"
#include "DwarfInstructions.hpp"
#include "EHHeaderParser.hpp"
#include "libunwind.h"
#include "Registers.hpp"
#include "RWMutex.hpp"
#include "Unwind-EHABI.h"
namespace libunwind { namespace libunwind {
#if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND) #if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND)
/// Cache of recently found FDEs. /// Cache of recently found FDEs.
template <typename A> template <typename A>
class _LIBUNWIND_HIDDEN DwarfFDECache { class _LIBUNWIND_HIDDEN DwarfFDECache {
typedef typename A::pint_t pint_t; typedef typename A::pint_t pint_t;
public: public:
▲ Show 20 Lines • Show All 2,768 Lines • Show Last 20 Lines