diff options
| author | Ryan Prichard <rprichard@google.com> | 2022-09-08 00:27:57 +0300 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2022-09-08 05:18:09 +0300 |
| commit | 6332a00d696d37942f2743851c86f1d4493968f0 (patch) | |
| tree | b965bffd2553c9fa08bd4c07af3c26c07c06131d /libunwind | |
| parent | 95b78898504c665907d52db9e2c5ecc28a31f5bb (diff) | |
[libunwind] Fix a few libunwind includes
In UnwindCursor.hpp, include config.h before checking _LIBUNWIND_SUPPORT_SEH_UNWIND.
Include libunwind_ext.h for UNW_STEP_SUCCESS.
Differential Revision: https://reviews.llvm.org/D86766
Diffstat (limited to 'libunwind')
| -rw-r--r-- | libunwind/src/CompactUnwinder.hpp | 1 | ||||
| -rw-r--r-- | libunwind/src/DwarfInstructions.hpp | 5 | ||||
| -rw-r--r-- | libunwind/src/UnwindCursor.hpp | 23 |
3 files changed, 15 insertions, 14 deletions
diff --git a/libunwind/src/CompactUnwinder.hpp b/libunwind/src/CompactUnwinder.hpp index 0b2b5e111bfc..a7a8a153d86a 100644 --- a/libunwind/src/CompactUnwinder.hpp +++ b/libunwind/src/CompactUnwinder.hpp @@ -19,6 +19,7 @@ #include <mach-o/compact_unwind_encoding.h> #include "Registers.hpp" +#include "libunwind_ext.h" #define EXTRACT_BITS(value, mask) \ ((value >> __builtin_ctz(mask)) & (((1 << __builtin_popcount(mask))) - 1)) diff --git a/libunwind/src/DwarfInstructions.hpp b/libunwind/src/DwarfInstructions.hpp index 77f13832d68f..f81f96ce5a36 100644 --- a/libunwind/src/DwarfInstructions.hpp +++ b/libunwind/src/DwarfInstructions.hpp @@ -16,10 +16,11 @@ #include <stdio.h> #include <stdlib.h> -#include "dwarf2.h" -#include "Registers.hpp" #include "DwarfParser.hpp" +#include "Registers.hpp" #include "config.h" +#include "dwarf2.h" +#include "libunwind_ext.h" namespace libunwind { diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp index e8b9556c035a..27eca0819149 100644 --- a/libunwind/src/UnwindCursor.hpp +++ b/libunwind/src/UnwindCursor.hpp @@ -38,6 +38,17 @@ #define _LIBUNWIND_CHECK_LINUX_SIGRETURN 1 #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) // Provide a definition for the DISPATCHER_CONTEXT struct for old (Win7 and // earlier) SDKs. @@ -75,18 +86,6 @@ extern "C" _Unwind_Reason_Code __libunwind_seh_personality( #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 { #if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND) |