summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprCXX.cpp
diff options
context:
space:
mode:
authorAlexey Bataev <a.bataev@hotmail.com>2018-05-02 16:52:07 +0000
committerAlexey Bataev <a.bataev@hotmail.com>2018-05-02 16:52:07 +0000
commit1ab34573197db6efd1eb07b95b836e46f1f88478 (patch)
treeb6d6e21b55f9a2ce3ef17ca0cd09bbd9677bf9b5 /clang/lib/Sema/SemaExprCXX.cpp
parent150cb6d91af313b84f1876e8a1f016cfe1e1e6d5 (diff)
downloadbcm5719-llvm-1ab34573197db6efd1eb07b95b836e46f1f88478.tar.gz
bcm5719-llvm-1ab34573197db6efd1eb07b95b836e46f1f88478.zip
[OPENMP] Enable c++ exceptions outside of the target constructs iff they are
enabled for the host. If the compilation for the host enables C++ exceptions, but they are not supported by the device, we still need to allow the code with the exception handling constructs outside of the target regions. llvm-svn: 331372
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index a24ae7a077e..95ea8418e1a 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -695,7 +695,11 @@ ExprResult Sema::BuildCXXThrow(SourceLocation OpLoc, Expr *Ex,
bool IsThrownVarInScope) {
// Don't report an error if 'throw' is used in system headers.
if (!getLangOpts().CXXExceptions &&
- !getSourceManager().isInSystemHeader(OpLoc))
+ !getSourceManager().isInSystemHeader(OpLoc) &&
+ (!getLangOpts().OpenMPIsDevice ||
+ !getLangOpts().OpenMPHostCXXExceptions ||
+ isInOpenMPTargetExecutionDirective() ||
+ isInOpenMPDeclareTargetContext()))
Diag(OpLoc, diag::err_exceptions_disabled) << "throw";
// Exceptions aren't allowed in CUDA device code.
OpenPOWER on IntegriCloud