Skip to content

Commit 578ea4f

Browse files
rprichardarichardson
authored andcommitted
[Headers][ARM] Allow struct _Unwind_Exception in unwind.h
Use the same approach as used in libunwind/include/unwind_arm_ehabi.h (D89570) and GCC's unwind-arm-common.h, so that _Unwind_Exception can be used both with and without the struct tag. Fixes a build failure in libcxxabi/test/forced_unwind1.pass.cpp. Reviewed By: danielkiss Differential Revision: https://reviews.llvm.org/D139503 (cherry picked from commit 106a992)
1 parent 0e82a82 commit 578ea4f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

clang/lib/Headers/unwind.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ struct _Unwind_Context;
6565
#if defined(__arm__) && !(defined(__USING_SJLJ_EXCEPTIONS__) || \
6666
defined(__ARM_DWARF_EH__) || defined(__SEH__))
6767
struct _Unwind_Control_Block;
68-
typedef struct _Unwind_Control_Block _Unwind_Exception; /* Alias */
68+
typedef struct _Unwind_Control_Block _Unwind_Control_Block;
69+
#define _Unwind_Exception _Unwind_Control_Block /* Alias */
6970
#else
7071
struct _Unwind_Exception;
7172
typedef struct _Unwind_Exception _Unwind_Exception;

0 commit comments

Comments
 (0)