OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libphobos: Give _Unwind_Exception an alignment that best resembles __attribute__((aligned)) 

For interoperability with C++ EH, the alignment should match, otherwise
D may not be able to intercept exceptions thrown from C++.

libphobos/ChangeLog:

	* libdruntime/gcc/unwind/generic.d (__aligned__): Define.
	(_Unwind_Exception): Align struct to __aligned__.

(cherry picked from commit efa5449a09)
This commit is contained in:
Iain Buclaw 2021-09-25 19:50:52 +02:00
parent 90d877c783
commit 0ef78377cb
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libphobos/libdruntime/gcc/unwind/generic.d
View File

@ -123,7 +123,27 @@ enum : _Unwind_Reason_Code
// @@@ The IA-64 ABI says that this structure must be double-word aligned.
// Taking that literally does not make much sense generically. Instead we
// provide the maximum alignment required by any type for the machine.
struct _Unwind_Exception
version (ARM) private enum __aligned__ = 8;
else version (AArch64) private enum __aligned__ = 16;
else version (HPPA) private enum __aligned__ = 8;
else version (HPPA64) private enum __aligned__ = 16;
else version (MIPS_N32) private enum __aligned__ = 16;
else version (MIPS_N64) private enum __aligned__ = 16;
else version (MIPS32) private enum __aligned__ = 8;
else version (MIPS64) private enum __aligned__ = 8;
else version (PPC) private enum __aligned__ = 16;
else version (PPC64) private enum __aligned__ = 16;
else version (RISCV32) private enum __aligned__ = 16;
else version (RISCV64) private enum __aligned__ = 16;
else version (S390) private enum __aligned__ = 8;
else version (SPARC) private enum __aligned__ = 8;
else version (SPARC64) private enum __aligned__ = 16;
else version (SystemZ) private enum __aligned__ = 8;
else version (X86) private enum __aligned__ = 16;
else version (X86_64) private enum __aligned__ = 16;
else static assert( false, "Platform not supported.");
align(__aligned__) struct _Unwind_Exception
{
_Unwind_Exception_Class exception_class;
_Unwind_Exception_Cleanup_Fn exception_cleanup;