diff options
| author | John McCall <rjmccall@apple.com> | 2011-07-28 07:23:35 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-07-28 07:23:35 +0000 |
| commit | fb7208119a60f68c87e7d4b6e4b87371871abb49 (patch) | |
| tree | fc4c7ef351edd8f0fe03a41ed14904d5a555d6e2 /lib/CodeGen/CGDecl.cpp | |
| parent | a17f0c486d4906db055005eb91f521d9a4867e70 (diff) | |
Fix a couple of problems with initialization and assignment to
__block variables where the act of initialization/assignment
itself causes the __block variable to be copied to the heap
because the variable is of block type and is being assigned
a block literal which captures the variable.
rdar://problem/9814099
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136337 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index a372d7d696..870fe811f1 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -507,7 +507,7 @@ void CodeGenFunction::EmitScalarInit(const Expr *init, // actually perform the initialization with an assign. bool accessedByInit = false; if (lifetime != Qualifiers::OCL_ExplicitNone) - accessedByInit = isAccessedBy(D, init); + accessedByInit = (capturedByInit || isAccessedBy(D, init)); if (accessedByInit) { LValue tempLV = lvalue; // Drill down to the __block object if necessary. |