diff options
| author | Akira Hatanaka <ahatanaka@apple.com> | 2018-09-09 05:22:49 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@apple.com> | 2018-09-09 05:22:49 +0000 |
| commit | 9bd24527082ff753f43ef4e211013e3c5a0a459e (patch) | |
| tree | 090190ca4c73eae2a47a9bc6c548b154ac5b8b98 /clang/lib/CodeGen/CGExpr.cpp | |
| parent | c14cb73c545297e8198d199f6cb783f544ac736c (diff) | |
| download | bcm5719-llvm-9bd24527082ff753f43ef4e211013e3c5a0a459e.tar.gz bcm5719-llvm-9bd24527082ff753f43ef4e211013e3c5a0a459e.zip | |
Revert r341754.
The commit broke a couple of bots:
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/12347
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/7310
llvm-svn: 341757
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); } |
