This is an archive of the discontinued LLVM Phabricator instance.

Differential D126866

[libcxxabi] Check __SEH__, when checking if ARM EHABI is implied
ClosedPublic

Authored by mstorsjo on Jun 2 2022, 2:35 AM.

Details

Reviewers
MaskRay
efriedma
zzheng
ldionne
Group Reviewers
Restricted Project
Commits
rG4a3722a2c3df: [libcxxabi] Check __SEH__, when checking if ARM EHABI is implied
Summary

ARM EHABI isn't signalled by any specific compiler builtin define,
but is implied by the lack of defines specifying any other
exception handling mechanism, __USING_SJLJ_EXCEPTIONS__ or
__ARM_DWARF_EH__.

As Windows SEH also can be used for unwinding, check for the
__SEH__ define too, in the same way.

Diff Detail

Event Timeline

mstorsjo created this revision.Jun 2 2022, 2:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2022, 2:35 AM
Herald added subscribers: StephenFan, kristof.beyls. · View Herald Transcript
mstorsjo requested review of this revision.Jun 2 2022, 2:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2022, 2:35 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B167476: Diff 433698.Jun 2 2022, 5:44 AM
mstorsjo mentioned this in D126863: [compiler-rt] Check __SEH__, when checking if ARM EHABI is implied.Jun 3 2022, 2:40 PM
MaskRay accepted this revision.Jun 5 2022, 11:38 AM

LGTM. As I mentioned in a previous patch, I don't know SEH enough to perform proper checks but I have read these changes and can confirm they are all reasonable.
The code change is similar to D126867. You may need to change either one to refer to the other differential.

ldionne accepted this revision.Jun 6 2022, 7:32 AM
This revision is now accepted and ready to land.Jun 6 2022, 7:32 AM
Closed by commit rG4a3722a2c3df: [libcxxabi] Check __SEH__, when checking if ARM EHABI is implied (authored by mstorsjo). · Explain WhyJun 6 2022, 1:19 PM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG4a3722a2c3df: [libcxxabi] Check __SEH__, when checking if ARM EHABI is implied.
mstorsjo mentioned this in rG2293d46a0175: [clang] [Headers] Check __SEH__, when checking if ARM EHABI is implied.Jun 6 2022, 1:28 PM
mstorsjo mentioned this in rG03c19f41a26a: [builtins] Check __SEH__, when checking if ARM EHABI is implied.
mstorsjo mentioned this in rG7c0e93cb89e6: [libunwind] Fix SEH unwinding on ARM.

Revision Contents

PathSize
libcxxabi/
include/
2 lines

Diff 434579

libcxxabi/include/__cxxabi_config.h

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef ____CXXABI_CONFIG_H #ifndef ____CXXABI_CONFIG_H
#define ____CXXABI_CONFIG_H #define ____CXXABI_CONFIG_H
#if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \ #if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \
!defined(__ARM_DWARF_EH__) !defined(__ARM_DWARF_EH__) && !defined(__SEH__)
#define _LIBCXXABI_ARM_EHABI #define _LIBCXXABI_ARM_EHABI
#endif #endif
#if !defined(__has_attribute) #if !defined(__has_attribute)
#define __has_attribute(_attribute_) 0 #define __has_attribute(_attribute_) 0
#endif #endif
#if defined(__clang__) #if defined(__clang__)
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines