diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2009-10-10 20:07:56 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-10-10 20:07:56 +0000 |
| commit | 07ca72725a049f9e070c36bc8b887061d60402f7 (patch) | |
| tree | e8d18bdf0ab191f67211de65e2a62e71a8c12a92 /clang/lib | |
| parent | b93f40fd72c84e4d8f3d19d5f495d5ae4a4274cc (diff) | |
| download | bcm5719-llvm-07ca72725a049f9e070c36bc8b887061d60402f7.tar.gz bcm5719-llvm-07ca72725a049f9e070c36bc8b887061d60402f7.zip | |
Generate weak read barriers when reading a weak __block
variable inside the block.
llvm-svn: 83729
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index d0c245369b4..dcb5684032b 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "CodeGenFunction.h" +#include "CGObjCRuntime.h" #include "CodeGenModule.h" #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" @@ -748,7 +749,10 @@ Value *ScalarExprEmitter::VisitStmtExpr(const StmtExpr *E) { } Value *ScalarExprEmitter::VisitBlockDeclRefExpr(const BlockDeclRefExpr *E) { - return Builder.CreateLoad(CGF.GetAddrOfBlockDecl(E), false, "tmp"); + llvm::Value *V = CGF.GetAddrOfBlockDecl(E); + if (E->getType().isObjCGCWeak()) + return CGF.CGM.getObjCRuntime().EmitObjCWeakRead(CGF, V); + return Builder.CreateLoad(V, false, "tmp"); } //===----------------------------------------------------------------------===// |
