block IRgen - Fixes a crash when determining if given block variable

is captured by a given statement expression. // rdar://10001085

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138314 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index 6e65e88bceb9b908dc577e6261c335dff350f8d4..6be6fcedd36c92a53c92b546617d4f9dc0758794 100644 (file)
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -875,6 +875,9 @@ static bool isCapturedBy(const VarDecl &var, const Expr *e) {
     return false;
   }
 
+  if (const StmtExpr *SE = dyn_cast<StmtExpr>(e))
+    e = cast<Expr>(SE->getSubStmt()->body_back());
+    
   for (Stmt::const_child_range children = e->children(); children; ++children)
     if (isCapturedBy(var, cast<Expr>(*children)))
       return true;

diff --git a/test/CodeGen/block-3.c b/test/CodeGen/block-3.c
new file mode 100644 (file)
index 0000000..95cb6a7
--- /dev/null
+++ b/test/CodeGen/block-3.c
@@ -0,0 +1,8 @@
+// RUN: %clang_cc1 %s -emit-llvm -o - -fblocks -triple x86_64-apple-darwin10 
+// rdar://10001085
+
+int main() {
+  ^{
+                __attribute__((__blocks__(byref))) int index = ({ int __a; int __b; __a < __b ? __b : __a; });
+   };
+}