diff options
| author | Akira Hatanaka <ahatanaka@apple.com> | 2018-10-01 20:29:34 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@apple.com> | 2018-10-01 20:29:34 +0000 |
| commit | 10452e78842f32b96df973916a40df4c3c40a5ef (patch) | |
| tree | 6a0907d8026c121245d7128b4c5caf5989f7366d /clang/lib/CodeGen/CGExpr.cpp | |
| parent | 83cf6a03b27c07be07c6f34d34f3c33e68bd9b56 (diff) | |
Revert r343518.
Bots are still failing.
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/24420
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/12958
Diffstat (limited to 'clang/lib/CodeGen/CGExpr.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExpr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 028aa963cda..b74937e9ca1 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -2486,7 +2486,7 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) { } assert(isa<BlockDecl>(CurCodeDecl)); - Address addr = GetAddrOfBlockDecl(VD); + Address addr = GetAddrOfBlockDecl(VD, VD->hasAttr<BlocksAttr>()); return MakeAddrLValue(addr, T, AlignmentSource::Decl); } } @@ -2538,7 +2538,7 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) { } // Drill into block byref variables. - bool isBlockByref = VD->isEscapingByref(); + bool isBlockByref = VD->hasAttr<BlocksAttr>(); if (isBlockByref) { addr = emitBlockByrefAddress(addr, VD); } |