diff options
| -rw-r--r-- | src/cxa_exception.hpp | 20 | ||||
| -rw-r--r-- | test/exception_object_alignment.sh.cpp | 48 |
2 files changed, 0 insertions, 68 deletions
diff --git a/src/cxa_exception.hpp b/src/cxa_exception.hpp index b9f74e3..c009db4 100644 --- a/src/cxa_exception.hpp +++ b/src/cxa_exception.hpp @@ -61,21 +61,7 @@ struct _LIBCXXABI_HIDDEN __cxa_exception { size_t referenceCount; #endif - // This field is annotated with attribute aligned so that the exception - // object following the field is sufficiently aligned and there is no - // gap between the field and the exception object. r276215 made a change to - // annotate _Unwind_Exception in unwind.h with __attribute__((aligned)), but - // we cannot incorporate the fix on Darwin since it is an ABI-breaking - // change, which is why we need the attribute on this field. - // - // For ARM EHABI, we do not align this field since _Unwind_Exception is an - // alias of _Unwind_Control_Block, which is not annotated with - // __attribute__((aligned). -#if defined(_LIBCXXABI_ARM_EHABI) _Unwind_Exception unwindHeader; -#else - _Unwind_Exception unwindHeader __attribute__((aligned)); -#endif }; // http://sourcery.mentor.com/archives/cxx-abi-dev/msg01924.html @@ -110,13 +96,7 @@ struct _LIBCXXABI_HIDDEN __cxa_dependent_exception { void* primaryException; #endif - // See the comment in __cxa_exception as to why this field has attribute - // aligned. -#if defined(_LIBCXXABI_ARM_EHABI) _Unwind_Exception unwindHeader; -#else - _Unwind_Exception unwindHeader __attribute__((aligned)); -#endif }; struct _LIBCXXABI_HIDDEN __cxa_eh_globals { diff --git a/test/exception_object_alignment.sh.cpp b/test/exception_object_alignment.sh.cpp deleted file mode 100644 index 5f4aea2..0000000 --- a/test/exception_object_alignment.sh.cpp +++ /dev/null @@ -1,48 +0,0 @@ -//===---------------- exception_object_alignment.sh.cpp -------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -// UNSUPPORTED: libcxxabi-no-exceptions - -// RUN: %build -O1 -// RUN: %run - -// This test used to fail on Darwin because field unwindHeader of struct -// __cxa_exception and the exception object that immediately followed were not -// 16B aligned. It would segfault in class derived's constructor when a movaps -// tried to write to a memory operand that was not 16B aligned. - -namespace { - -struct S { - int a; - int __attribute__((aligned(16))) b; -}; - -class base1 { -protected: - virtual ~base1() throw() {} -}; - -class derived: public base1 { -public: - derived() : member() {} -private: - S member; -}; - -} - -int main() { - try { - throw derived(); - } - catch(...) { - } - return 0; -} |