commit 9959db5fa9d4972b6f5510344d502ff4932b0c0e
author Alexey Bataev <a.bataev@hotmail.com> Tue May 06 10:08:46 2014 +0000
committer Alexey Bataev <a.bataev@hotmail.com> Tue May 06 10:08:46 2014 +0000
tree f9022d5800c5e078854567445218a23710ff1cba
parent fdce7cea931fc6fcb995a1193b3ae7f78a913f0d

[OPENMP] Initial codegen for '#pragma omp parallel'

llvm-svn: 208077

clang/lib/CodeGen/CGException.cpp

diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp
index bd54523..ef651bc 100644
--- a/clang/lib/CodeGen/CGException.cpp
+++ b/clang/lib/CodeGen/CGException.cpp
@@ -492,8 +492,14 @@
     return;
   
   const FunctionDecl* FD = dyn_cast_or_null<FunctionDecl>(D);
-  if (FD == 0)
+  if (FD == 0) {
+    // Check if CapturedDecl is nothrow and create terminate scope for it.
+    if (const CapturedDecl* CD = dyn_cast_or_null<CapturedDecl>(D)) {
+      if (CD->isNothrow())
+        EHStack.pushTerminate();
+    }
     return;
+  }
   const FunctionProtoType *Proto = FD->getType()->getAs<FunctionProtoType>();
   if (Proto == 0)
     return;
@@ -560,8 +566,14 @@
     return;
   
   const FunctionDecl* FD = dyn_cast_or_null<FunctionDecl>(D);
-  if (FD == 0)
+  if (FD == 0) {
+    // Check if CapturedDecl is nothrow and pop terminate scope for it.
+    if (const CapturedDecl* CD = dyn_cast_or_null<CapturedDecl>(D)) {
+      if (CD->isNothrow())
+        EHStack.popTerminate();
+    }
     return;
+  }
   const FunctionProtoType *Proto = FD->getType()->getAs<FunctionProtoType>();
   if (Proto == 0)
     return;