diff options
| author | John McCall <rjmccall@apple.com> | 2011-03-16 02:53:38 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-03-16 02:53:38 +0000 |
| commit | a5bcb8fec45d127501cd70fe1654b5a08a8aeb35 (patch) | |
| tree | 6e8cb53d4941cf7652cba6805440ece0b5e320e0 /lib/CodeGen/CGExprScalar.cpp | |
| parent | d5fde2106af8e78cc1b97d6369ad0de5d0875491 (diff) | |
Don't emit read barriers for reading __weak __block variables
in non-GC mode.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127725 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 8326dcc7a8..27b868974d 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1221,10 +1221,8 @@ Value *ScalarExprEmitter::VisitStmtExpr(const StmtExpr *E) { } Value *ScalarExprEmitter::VisitBlockDeclRefExpr(const BlockDeclRefExpr *E) { - llvm::Value *V = CGF.GetAddrOfBlockDecl(E); - if (E->getType().isObjCGCWeak()) - return CGF.CGM.getObjCRuntime().EmitObjCWeakRead(CGF, V); - return CGF.EmitLoadOfScalar(V, false, 0, E->getType()); + LValue LV = CGF.EmitBlockDeclRefLValue(E); + return CGF.EmitLoadOfLValue(LV, E->getType()).getScalarVal(); } //===----------------------------------------------------------------------===// |