[gcc r12-3986] libphobos: Give _Unwind_Exception an alignment that best resembles __attribute__((aligned))

Iain Buclaw ibuclaw@gcc.gnu.org
Thu Sep 30 16:41:21 GMT 2021


https://gcc.gnu.org/g:efa5449a094d3887e124d400ff0410af2c745b2d

commit r12-3986-gefa5449a094d3887e124d400ff0410af2c745b2d
Author: Iain Buclaw <ibuclaw@gdcproject.org>
Date:   Sat Sep 25 19:50:52 2021 +0200

    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__.

Diff:
---
 libphobos/libdruntime/gcc/unwind/generic.d | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/libphobos/libdruntime/gcc/unwind/generic.d b/libphobos/libdruntime/gcc/unwind/generic.d
index 592b3afcb71..68ddd1d5410 100644
--- a/libphobos/libdruntime/gcc/unwind/generic.d
+++ b/libphobos/libdruntime/gcc/unwind/generic.d
@@ -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;


More information about the Gcc-cvs mailing list