diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-23 18:57:30 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-09-23 18:57:30 +0000 |
| commit | c367b8f8cc2352430f434254ee4d6b23d6af59a9 (patch) | |
| tree | cf555e0a40eeddd8fe472396ca858a6cfdfcce07 /clang/lib/AST/Expr.cpp | |
| parent | 947961c15120b6630af3ac59221273d26ac84d39 (diff) | |
| download | bcm5719-llvm-c367b8f8cc2352430f434254ee4d6b23d6af59a9.tar.gz bcm5719-llvm-c367b8f8cc2352430f434254ee4d6b23d6af59a9.zip | |
objc-gc: Fix a corner case where clang fails to generate GC
write barrier with captured pointer to object. // rdar://10150823
llvm-svn: 140399
Diffstat (limited to 'clang/lib/AST/Expr.cpp')
| -rw-r--r-- | clang/lib/AST/Expr.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index a358693a52c..ba191a8c80b 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -1728,8 +1728,15 @@ bool Expr::isOBJCGCCandidate(ASTContext &Ctx) const { ->isOBJCGCCandidate(Ctx); case CStyleCastExprClass: return cast<CStyleCastExpr>(E)->getSubExpr()->isOBJCGCCandidate(Ctx); + case BlockDeclRefExprClass: case DeclRefExprClass: { - const Decl *D = cast<DeclRefExpr>(E)->getDecl(); + + const Decl *D; + if (const BlockDeclRefExpr *BDRE = dyn_cast<BlockDeclRefExpr>(E)) + D = BDRE->getDecl(); + else + D = cast<DeclRefExpr>(E)->getDecl(); + if (const VarDecl *VD = dyn_cast<VarDecl>(D)) { if (VD->hasGlobalStorage()) return true; |
