This is an archive of the discontinued LLVM Phabricator instance.

Differential D84787

[SystemZ/ZOS] __(de)register_frame are not available on z/OS.
ClosedPublic

Authored by Kai on Jul 28 2020, 12:16 PM.

Details

Reviewers
lhames
kbarton
uweigand
yusra.syeda
xingxue
abhina.sreeskantharajan
hubert.reinterpretcast
Commits
rGc2ae7934c809: [SystemZ/ZOS]__(de)register_frame are not available on z/OS.
Summary

The functions __register_frame/__deregister_frame are not available on z/OS, so add a guard to not use them.

Diff Detail

Event Timeline

Kai created this revision.Jul 28 2020, 12:16 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 28 2020, 12:16 PM
Herald added subscribers: llvm-commits, hiraditya. · View Herald Transcript
Kai requested review of this revision.Jul 28 2020, 12:16 PM
zibi added a subscriber: zibi.Jul 28 2020, 2:08 PM

LGTM

Kai added a comment.Aug 11 2020, 4:27 AM

Any comments on this change?

Kai added reviewers: abhina.sreeskantharajan, hubert.reinterpretcast.Aug 14 2020, 2:56 AM
abhina.sreeskantharajan accepted this revision.Aug 14 2020, 7:04 AM

LGTM

This revision is now accepted and ready to land.Aug 14 2020, 7:04 AM
lhames accepted this revision.Aug 14 2020, 9:45 AM

Sorry I missed this one earlier. Looks good to me too.

Closed by commit rGc2ae7934c809: [SystemZ/ZOS]__(de)register_frame are not available on z/OS. (authored by Kai). · Explain WhyAug 17 2020, 6:00 AM
This revision was automatically updated to reflect the committed changes.
Kai added a commit: rGc2ae7934c809: [SystemZ/ZOS]__(de)register_frame are not available on z/OS..

Revision Contents

PathSize
llvm/
lib/
ExecutionEngine/
JITLink/
4 lines
RuntimeDyld/
4 lines

Diff 285991

llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp

Show First 20 Lines • Show All 625 Lines • ▼ Show 20 Lines if (!B)
return make_error<JITLinkError>("No symbol or block covering address " + return make_error<JITLinkError>("No symbol or block covering address " +
formatv("{0:x16}", Addr)); formatv("{0:x16}", Addr));
return PC.G.addAnonymousSymbol(*B, Addr - B->getAddress(), 0, false, false); return PC.G.addAnonymousSymbol(*B, Addr - B->getAddress(), 0, false, false);
} }
// Determine whether we can register EH tables. // Determine whether we can register EH tables.
#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \ #if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
!(defined(_AIX) && defined(__ibmxl__)) && !defined(__SEH__) && \ !(defined(_AIX) && defined(__ibmxl__)) && !defined(__MVS__) && \
!defined(__USING_SJLJ_EXCEPTIONS__)) !defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__))
#define HAVE_EHTABLE_SUPPORT 1 #define HAVE_EHTABLE_SUPPORT 1
#else #else
#define HAVE_EHTABLE_SUPPORT 0 #define HAVE_EHTABLE_SUPPORT 0
#endif #endif
#if HAVE_EHTABLE_SUPPORT #if HAVE_EHTABLE_SUPPORT
extern "C" void __register_frame(const void *); extern "C" void __register_frame(const void *);
extern "C" void __deregister_frame(const void *); extern "C" void __deregister_frame(const void *);
▲ Show 20 Lines • Show All 162 Lines • Show Last 20 Lines

llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp

Show All 27 Lines
#endif #endif
namespace llvm { namespace llvm {
RTDyldMemoryManager::~RTDyldMemoryManager() {} RTDyldMemoryManager::~RTDyldMemoryManager() {}
// Determine whether we can register EH tables. // Determine whether we can register EH tables.
#if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \ #if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
!(defined(_AIX) && defined(__ibmxl__)) && !defined(__SEH__) && \ !(defined(_AIX) && defined(__ibmxl__)) && !defined(__MVS__) && \
!defined(__USING_SJLJ_EXCEPTIONS__)) !defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__))
#define HAVE_EHTABLE_SUPPORT 1 #define HAVE_EHTABLE_SUPPORT 1
#else #else
#define HAVE_EHTABLE_SUPPORT 0 #define HAVE_EHTABLE_SUPPORT 0
#endif #endif
#if HAVE_EHTABLE_SUPPORT #if HAVE_EHTABLE_SUPPORT
extern "C" void __register_frame(void *); extern "C" void __register_frame(void *);
extern "C" void __deregister_frame(void *); extern "C" void __deregister_frame(void *);
▲ Show 20 Lines • Show All 258 Lines • Show Last 20 Lines