diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-08-23 00:27:49 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-08-23 00:27:49 +0000 |
| commit | b9dbab1e78917c80704428f948f7b2ef8110f8e1 (patch) | |
| tree | d62e09dce17f2dc45b350d692fccc7d576be3187 | |
| parent | 6fa7dbeac72b5d29484a6e01cc4e9b68b49133a4 (diff) | |
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
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGen/block-3.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 6e65e88bce..6be6fcedd3 100644 --- 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 index 0000000000..95cb6a735c --- /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; }); + }; +} |