maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libcxxabi] Fix layout of __cxa_exception for win64 

Win64 isn't LP64, it's LLP64, but there's no __LLP64__ predefined -
just check _WIN64 in addition to __LP64__.

This fixes compilation after static asserts about the struct layout
were added in f2a436058f.

Differential Revision: https://reviews.llvm.org/D73838
This commit is contained in:
Martin Storsjö 2020-02-01 13:32:57 +02:00
parent 2dc45bf392
commit 09dc884eb2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcxxabi/src/cxa_exception.h
View File

@ -28,7 +28,7 @@ _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint6
_LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*);
struct _LIBCXXABI_HIDDEN __cxa_exception { struct _LIBCXXABI_HIDDEN __cxa_exception {
#if defined(__LP64__) || defined(_LIBCXXABI_ARM_EHABI) #if defined(__LP64__) || defined(_WIN64) || defined(_LIBCXXABI_ARM_EHABI)
// Now _Unwind_Exception is marked with __attribute__((aligned)), // Now _Unwind_Exception is marked with __attribute__((aligned)),
// which implies __cxa_exception is also aligned. Insert padding // which implies __cxa_exception is also aligned. Insert padding
// in the beginning of the struct, rather than before unwindHeader. // in the beginning of the struct, rather than before unwindHeader.
@ -62,7 +62,7 @@ struct _LIBCXXABI_HIDDEN __cxa_exception {
void *adjustedPtr; void *adjustedPtr;
#endif #endif
#if !defined(__LP64__) && !defined(_LIBCXXABI_ARM_EHABI) #if !defined(__LP64__) && !defined(_WIN64) && !defined(_LIBCXXABI_ARM_EHABI)
// This is a new field to support C++ 0x exception_ptr. // This is a new field to support C++ 0x exception_ptr.
// For binary compatibility it is placed where the compiler // For binary compatibility it is placed where the compiler
// previously adding padded to 64-bit align unwindHeader. // previously adding padded to 64-bit align unwindHeader.
@ -75,7 +75,7 @@ struct _LIBCXXABI_HIDDEN __cxa_exception {
// The layout of this structure MUST match the layout of __cxa_exception, with // The layout of this structure MUST match the layout of __cxa_exception, with
// primaryException instead of referenceCount. // primaryException instead of referenceCount.
struct _LIBCXXABI_HIDDEN __cxa_dependent_exception { struct _LIBCXXABI_HIDDEN __cxa_dependent_exception {
#if defined(__LP64__) || defined(_LIBCXXABI_ARM_EHABI) #if defined(__LP64__) || defined(_WIN64) || defined(_LIBCXXABI_ARM_EHABI)
void* reserve; // padding. void* reserve; // padding.
void* primaryException; void* primaryException;
#endif #endif
@ -100,7 +100,7 @@ struct _LIBCXXABI_HIDDEN __cxa_dependent_exception {
void *adjustedPtr; void *adjustedPtr;
#endif #endif
#if !defined(__LP64__) && !defined(_LIBCXXABI_ARM_EHABI) #if !defined(__LP64__) && !defined(_WIN64) && !defined(_LIBCXXABI_ARM_EHABI)
void* primaryException; void* primaryException;
#endif #endif
_Unwind_Exception unwindHeader; _Unwind_Exception unwindHeader;
@ -125,7 +125,7 @@ static_assert(offsetof(__cxa_dependent_exception, propagationCount) +
sizeof(_Unwind_Exception) + sizeof(void*) == sizeof(_Unwind_Exception) + sizeof(void*) ==
sizeof(__cxa_dependent_exception), sizeof(__cxa_dependent_exception),
"propagationCount has wrong negative offset"); "propagationCount has wrong negative offset");
#elif defined(__LP64__) #elif defined(__LP64__) || defined(_WIN64)
static_assert(offsetof(__cxa_exception, adjustedPtr) + static_assert(offsetof(__cxa_exception, adjustedPtr) +
sizeof(_Unwind_Exception) + sizeof(void*) == sizeof(_Unwind_Exception) + sizeof(void*) ==
sizeof(__cxa_exception), sizeof(__cxa_exception),