commit 41e3eafaf224efe23d58915ab2ddc2bfea215c4d
author Daniel Kiss <daniel.kiss@arm.com> Thu Sep 02 11:30:26 2021 +0200
committer Copybara-Service <copybara-worker@google.com> Thu Sep 02 02:32:25 2021 -0700
tree 4fe7b2fe02caaa2e7362ecf3bec3c7949a439d49
parent 98aadde2b1242e463759aeb0bce4bffacb611088

[Unwind] Harmonise exception class for EHABI spec.

EHABI defines the exception class as char[8] instead of uint64_t [1].
For ABI compatibility the ABI the definition needs to be updated.

[1] https://github.com/ARM-software/abi-aa/blob/main/ehabi32/ehabi32.rst#82language-independent-unwinding-types-and-functions

Reviewed By: manojgupta, MaskRay, #libunwind

Differential Revision: https://reviews.llvm.org/D109047

GitOrigin-RevId: f5b997e6b7061323fff13fafcc0c311d9e78e848

test/forced_unwind1.pass.cpp

diff --git a/test/forced_unwind1.pass.cpp b/test/forced_unwind1.pass.cpp
index b6963a0..de376a8 100644
--- a/test/forced_unwind1.pass.cpp
+++ b/test/forced_unwind1.pass.cpp
@@ -53,7 +53,7 @@
 
 static void forced_unwind() {
   _Unwind_Exception* exc = new _Unwind_Exception;
-  exc->exception_class = 0;
+  memset(&exc->exception_class, 0, sizeof(exc->exception_class));
   exc->exception_cleanup = cleanup;
   _Unwind_ForcedUnwind(exc, Stop<_Unwind_Stop_Fn>::stop, 0);
   abort();

test/forced_unwind2.pass.cpp

diff --git a/test/forced_unwind2.pass.cpp b/test/forced_unwind2.pass.cpp
index 037f049..a221dfc 100644
--- a/test/forced_unwind2.pass.cpp
+++ b/test/forced_unwind2.pass.cpp
@@ -41,7 +41,7 @@
 
 static void forced_unwind() {
   _Unwind_Exception* exc = new _Unwind_Exception;
-  exc->exception_class = 0;
+  memset(&exc->exception_class, 0, sizeof(exc->exception_class));
   exc->exception_cleanup = 0;
   _Unwind_ForcedUnwind(exc, Stop<_Unwind_Stop_Fn>::stop, 0);
   abort();