maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

When copy-capturing values for a nested capture, use a BlockDeclRefExpr. 

llvm-svn: 125021
This commit is contained in:
John McCall 2011-02-07 18:37:40 +00:00
parent 389971b318
commit 93be3f75cc
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/CodeGen/CGBlocks.cpp
View File

@ -583,10 +583,18 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const BlockExpr *blockExpr) {
// Otherwise, fake up a POD copy into the block field.
} else {
DeclRefExpr declRef(const_cast<VarDecl*>(variable), type, VK_LValue,
SourceLocation());
// We use one of these or the other depending on whether the
// reference is nested.
DeclRefExpr notNested(const_cast<VarDecl*>(variable), type, VK_LValue,
SourceLocation());
BlockDeclRefExpr nested(const_cast<VarDecl*>(variable), type,
VK_LValue, SourceLocation(), /*byref*/ false);
Expr *declRef =
(ci->isNested() ? static_cast<Expr*>(&nested) : &notNested);
ImplicitCastExpr l2r(ImplicitCastExpr::OnStack, type, CK_LValueToRValue,
&declRef, VK_RValue);
declRef, VK_RValue);
EmitAnyExprToMem(&l2r, blockField, /*volatile*/ false, /*init*/ true);
}

10
clang/test/CodeGenCXX/blocks.cpp Normal file
View File

@ -0,0 +1,10 @@
// RUN: %clang_cc1 %s -fblocks -triple x86_64-apple-darwin -emit-llvm -o - | FileCheck %s
namespace test0 {
// CHECK: define void @_ZN5test04testEi(
// CHECK: define internal void @__test_block_invoke_{{.*}}(
// CHECK: define internal void @__block_global_{{.*}}(
void test(int x) {
^{ ^{ (void) x; }; };
}
}