Skip to content

[SystemZ][z/OS] Make z/OS personality function known #89679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion llvm/include/llvm/IR/EHPersonalities.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ enum class EHPersonality {
CoreCLR,
Rust,
Wasm_CXX,
XL_CXX
XL_CXX,
ZOS_CXX,
};

/// See if the given exception handling personality function is one
Expand Down
3 changes: 3 additions & 0 deletions llvm/lib/IR/EHPersonalities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ EHPersonality llvm::classifyEHPersonality(const Value *Pers) {
.Case("rust_eh_personality", EHPersonality::Rust)
.Case("__gxx_wasm_personality_v0", EHPersonality::Wasm_CXX)
.Case("__xlcxx_personality_v1", EHPersonality::XL_CXX)
.Case("__zos_cxx_personality_v2", EHPersonality::ZOS_CXX)
.Default(EHPersonality::Unknown);
}

Expand Down Expand Up @@ -73,6 +74,8 @@ StringRef llvm::getEHPersonalityName(EHPersonality Pers) {
return "__gxx_wasm_personality_v0";
case EHPersonality::XL_CXX:
return "__xlcxx_personality_v1";
case EHPersonality::ZOS_CXX:
return "__zos_cxx_personality_v2";
case EHPersonality::Unknown:
llvm_unreachable("Unknown EHPersonality!");
}
Expand Down
1 change: 1 addition & 0 deletions llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3972,6 +3972,7 @@ static bool isCatchAll(EHPersonality Personality, Constant *TypeInfo) {
case EHPersonality::CoreCLR:
case EHPersonality::Wasm_CXX:
case EHPersonality::XL_CXX:
case EHPersonality::ZOS_CXX:
return TypeInfo->isNullValue();
}
llvm_unreachable("invalid enum");
Expand Down
12 changes: 12 additions & 0 deletions llvm/test/CodeGen/SystemZ/zos-no-eh-label.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
; RUN: llc -mtriple s390x-ibm-zos < %s | FileCheck %s

define signext i32 @_Z9computeitv() personality ptr @__zos_cxx_personality_v2 {
ret i32 0
}

declare i32 @__zos_cxx_personality_v2(...)

; The personality function is unused, therefore check that it is not referenced.
; There should also be no exception table.
; CHECK-NOT: __zos_cxx_personality_v2
; CHECK-NOT: GCC_except_table
Loading