Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions clang/lib/CodeGen/CGException.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ void CodeGenFunction::EmitCXXThrowExpr(const CXXThrowExpr *E,
// Therefore, we emit a trap which will abort the program, and
// prompt a warning indicating that a trap will be emitted.
const llvm::Triple &T = Target.getTriple();
if (CGM.getLangOpts().OpenMPIsTargetDevice && (T.isNVPTX() || T.isAMDGCN())) {
if (CGM.getLangOpts().OpenMPIsTargetDevice && T.isGPU()) {
EmitTrapCall(llvm::Intrinsic::trap);
return;
}
Expand Down Expand Up @@ -627,7 +627,7 @@ void CodeGenFunction::EmitCXXTryStmt(const CXXTryStmt &S) {
// If we encounter a try statement on in an OpenMP target region offloaded to
// a GPU, we treat it as a basic block.
const bool IsTargetDevice =
(CGM.getLangOpts().OpenMPIsTargetDevice && (T.isNVPTX() || T.isAMDGCN()));
(CGM.getLangOpts().OpenMPIsTargetDevice && T.isGPU());
if (!IsTargetDevice)
EnterCXXTryStmt(S);
EmitStmt(S.getTryBlock());
Expand Down
3 changes: 1 addition & 2 deletions clang/lib/Frontend/CompilerInvocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4303,8 +4303,7 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,

// Set the flag to prevent the implementation from emitting device exception
// handling code for those requiring so.
if ((Opts.OpenMPIsTargetDevice && (T.isNVPTX() || T.isAMDGCN())) ||
Opts.OpenCLCPlusPlus) {
if ((Opts.OpenMPIsTargetDevice && T.isGPU()) || Opts.OpenCLCPlusPlus) {

Opts.Exceptions = 0;
Opts.CXXExceptions = 0;
Expand Down
9 changes: 9 additions & 0 deletions clang/test/OpenMP/spirv_target_codegen_noexceptions.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// RUN: %clang_cc1 -fexceptions -fcxx-exceptions -Wno-openmp-target-exception -fopenmp -x c++ -triple x86_64-unknown-linux -fopenmp-targets=spirv64-intel -emit-llvm-bc %s -o %t-host.bc
// RUN: %clang_cc1 -fexceptions -fcxx-exceptions -Wno-openmp-target-exception -fopenmp -x c++ -triple spirv64-intel -fopenmp-targets=spirv64-intel -emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path %t-host.bc -o - | \
// RUN: FileCheck -implicit-check-not='{{invoke|throw|cxa}}' %s
void foo() {
// CHECK: call addrspace(9) void @llvm.trap()
// CHECK-NEXT: call spir_func addrspace(9) void @__kmpc_target_deinit()
#pragma omp target
throw "bad";
}