diff options
| -rw-r--r-- | libcxxabi/src/cxa_exception.hpp | 12 | ||||
| -rw-r--r-- | libcxxabi/test/exception_object_alignment.sh.cpp | 46 |
2 files changed, 2 insertions, 56 deletions
diff --git a/libcxxabi/src/cxa_exception.hpp b/libcxxabi/src/cxa_exception.hpp index 2d346984702..c009db477e5 100644 --- a/libcxxabi/src/cxa_exception.hpp +++ b/libcxxabi/src/cxa_exception.hpp @@ -61,13 +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 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. - _Unwind_Exception unwindHeader __attribute__((aligned)); + _Unwind_Exception unwindHeader; }; // http://sourcery.mentor.com/archives/cxx-abi-dev/msg01924.html @@ -102,9 +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. - _Unwind_Exception unwindHeader __attribute__((aligned)); + _Unwind_Exception unwindHeader; }; struct _LIBCXXABI_HIDDEN __cxa_eh_globals { diff --git a/libcxxabi/test/exception_object_alignment.sh.cpp b/libcxxabi/test/exception_object_alignment.sh.cpp deleted file mode 100644 index 076f45c603f..00000000000 --- a/libcxxabi/test/exception_object_alignment.sh.cpp +++ /dev/null @@ -1,46 +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: %cxx %flags %compile_flags -O1 %s -o %t.exe -// RUN: %exec %t.exe - -// This test used to segfault on Darwin because field unwindHeader of struct -// __cxa_exception 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; -} |
