diff options
author | Justin Lebar <jlebar@google.com> | 2016-09-28 22:45:54 +0000 |
---|---|---|
committer | Justin Lebar <jlebar@google.com> | 2016-09-28 22:45:54 +0000 |
commit | 2a8db34044c3a994bc2198730ac61a8a7f38878f (patch) | |
tree | 9544819afa3d8f111e7f239620142630f0746db2 /clang/lib | |
parent | e2f51befb82123e43cbee373bb6bb2064817086a (diff) | |
download | bcm5719-llvm-2a8db34044c3a994bc2198730ac61a8a7f38878f.tar.gz bcm5719-llvm-2a8db34044c3a994bc2198730ac61a8a7f38878f.zip |
[CUDA] Disallow exceptions in device code.
Reviewers: tra
Subscribers: cfe-commits, jhen
Differential Revision: https://reviews.llvm.org/D25036
llvm-svn: 282646
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/Sema/SemaCUDA.cpp | 24 | ||||
-rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 4 | ||||
-rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 4 |
3 files changed, 32 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaCUDA.cpp b/clang/lib/Sema/SemaCUDA.cpp index 6f94e54a0cc..b1939a17157 100644 --- a/clang/lib/Sema/SemaCUDA.cpp +++ b/clang/lib/Sema/SemaCUDA.cpp @@ -515,3 +515,27 @@ bool Sema::CheckCUDACall(SourceLocation Loc, FunctionDecl *Callee) { } return true; } + +bool Sema::CheckCUDAExceptionExpr(SourceLocation Loc, StringRef ExprTy) { + assert(getLangOpts().CUDA && "Should only be called during CUDA compilation"); + FunctionDecl *CurFn = dyn_cast<FunctionDecl>(CurContext); + if (!CurFn) + return true; + CUDAFunctionTarget Target = IdentifyCUDATarget(CurFn); + + // Raise an error immediately if this is a __global__ or __device__ function. + // If it's a __host__ __device__ function, enqueue a deferred error which will + // be emitted if the function is codegen'ed for device. + if (Target == CFT_Global || Target == CFT_Device) { + Diag(Loc, diag::err_cuda_device_exceptions) << ExprTy << Target << CurFn; + return false; + } + if (Target == CFT_HostDevice && getLangOpts().CUDAIsDevice) { + PartialDiagnostic ErrPD{PartialDiagnostic::NullDiagnostic()}; + ErrPD.Reset(diag::err_cuda_device_exceptions); + ErrPD << ExprTy << Target << CurFn; + CurFn->addDeferredDiag({Loc, std::move(ErrPD)}); + return false; + } + return true; +} diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index a0bf324a714..42888badd2e 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -683,6 +683,10 @@ ExprResult Sema::BuildCXXThrow(SourceLocation OpLoc, Expr *Ex, !getSourceManager().isInSystemHeader(OpLoc)) Diag(OpLoc, diag::err_exceptions_disabled) << "throw"; + // Exceptions aren't allowed in CUDA device code. + if (getLangOpts().CUDA) + CheckCUDAExceptionExpr(OpLoc, "throw"); + if (getCurScope() && getCurScope()->isOpenMPSimdDirectiveScope()) Diag(OpLoc, diag::err_omp_simd_region_cannot_use_stmt) << "throw"; diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 977d7447d73..901f875840e 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -3644,6 +3644,10 @@ StmtResult Sema::ActOnCXXTryBlock(SourceLocation TryLoc, Stmt *TryBlock, !getSourceManager().isInSystemHeader(TryLoc)) Diag(TryLoc, diag::err_exceptions_disabled) << "try"; + // Exceptions aren't allowed in CUDA device code. + if (getLangOpts().CUDA) + CheckCUDAExceptionExpr(TryLoc, "try"); + if (getCurScope() && getCurScope()->isOpenMPSimdDirectiveScope()) Diag(TryLoc, diag::err_omp_simd_region_cannot_use_stmt) << "try"; |