summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2011-08-23 00:27:49 +0000
committerFariborz Jahanian <fjahanian@apple.com>2011-08-23 00:27:49 +0000
commitb50801f0490369d12b3deb6bdcefe8d6fe72a6bb (patch)
tree2ab1b50bebb6946d4be9f847c57dc8143847c7f3 /clang/lib/CodeGen
parentf5b0234992365f342019af0a468d255c65a869f4 (diff)
downloadbcm5719-llvm-b50801f0490369d12b3deb6bdcefe8d6fe72a6bb.tar.gz
bcm5719-llvm-b50801f0490369d12b3deb6bdcefe8d6fe72a6bb.zip
block IRgen - Fixes a crash when determining if given block variable
is captured by a given statement expression. // rdar://10001085 llvm-svn: 138314
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGDecl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 6e65e88bceb..6be6fcedd36 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/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;
OpenPOWER on IntegriCloud