diff options
author | Akira Hatanaka <ahatanaka@apple.com> | 2018-10-01 21:51:28 +0000 |
---|---|---|
committer | Akira Hatanaka <ahatanaka@apple.com> | 2018-10-01 21:51:28 +0000 |
commit | 8e57b07f668528fa4ed893093342ba8d899a1556 (patch) | |
tree | 02696f84b64c2a199178a3e9044b33e87f411e30 /clang/lib/CodeGen/CGClass.cpp | |
parent | 7a6966ec27d9ca1507eedaf1ee487dfab14478d0 (diff) | |
download | bcm5719-llvm-8e57b07f668528fa4ed893093342ba8d899a1556.tar.gz bcm5719-llvm-8e57b07f668528fa4ed893093342ba8d899a1556.zip |
Distinguish `__block` variables that are captured by escaping blocks
from those that aren't.
This patch changes the way __block variables that aren't captured by
escaping blocks are handled:
- Since non-escaping blocks on the stack never get copied to the heap
(see https://reviews.llvm.org/D49303), Sema shouldn't error out when
the type of a non-escaping __block variable doesn't have an accessible
copy constructor.
- IRGen doesn't have to use the specialized byref structure (see
https://clang.llvm.org/docs/Block-ABI-Apple.html#id8) for a
non-escaping __block variable anymore. Instead IRGen can emit the
variable as a normal variable and copy the reference to the block
literal. Byref copy/dispose helpers aren't needed either.
This reapplies r343518 after fixing a use-after-free bug in function
Sema::ActOnBlockStmtExpr where the BlockScopeInfo was dereferenced after
it was popped and deleted.
rdar://problem/39352313
Differential Revision: https://reviews.llvm.org/D51564
llvm-svn: 343542
Diffstat (limited to 'clang/lib/CodeGen/CGClass.cpp')
-rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 468d81cbbb7..aca0fd6f6e3 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -2839,7 +2839,7 @@ void CodeGenFunction::EmitLambdaBlockInvokeBody() { CallArgList CallArgs; QualType ThisType = getContext().getPointerType(getContext().getRecordType(Lambda)); - Address ThisPtr = GetAddrOfBlockDecl(variable, false); + Address ThisPtr = GetAddrOfBlockDecl(variable); CallArgs.add(RValue::get(ThisPtr.getPointer()), ThisType); // Add the rest of the parameters. |