summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2011-07-30 01:07:55 +0000
committerFariborz Jahanian <fjahanian@apple.com>2011-07-30 01:07:55 +0000
commitbce9ee2ae679ce6b634921eec564aedd7122d48a (patch)
tree655f3d2edbda04c699fad21708f0440867b378a9
parent5670f850c6f8f16b9f2118841effbdfd49652de7 (diff)
downloadbcm5719-llvm-bce9ee2ae679ce6b634921eec564aedd7122d48a.tar.gz
bcm5719-llvm-bce9ee2ae679ce6b634921eec564aedd7122d48a.zip
objc rewriter - set the flag passed to _Block_object_assign/_Block_object_dispose correctly
for copying a captured block object. // rdar://9846759 llvm-svn: 136549
-rw-r--r--clang/lib/Rewrite/RewriteObjC.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Rewrite/RewriteObjC.cpp b/clang/lib/Rewrite/RewriteObjC.cpp
index a8fefb01656..3e57e12db7e 100644
--- a/clang/lib/Rewrite/RewriteObjC.cpp
+++ b/clang/lib/Rewrite/RewriteObjC.cpp
@@ -4260,7 +4260,7 @@ std::string RewriteObjC::SynthesizeBlockHelperFuncs(BlockExpr *CE, int i,
if (BlockByRefDeclsPtrSet.count((*I)))
S += ", " + utostr(BLOCK_FIELD_IS_BYREF) + "/*BLOCK_FIELD_IS_BYREF*/);";
else
- S += ", " + utostr(BLOCK_FIELD_IS_OBJECT) + "/*BLOCK_FIELD_IS_OBJECT*/);";
+ S += ", " + utostr(BLOCK_FIELD_IS_BLOCK) + "/*BLOCK_FIELD_IS_BLOCK*/);";
}
S += "}\n";
@@ -4276,7 +4276,7 @@ std::string RewriteObjC::SynthesizeBlockHelperFuncs(BlockExpr *CE, int i,
if (BlockByRefDeclsPtrSet.count((*I)))
S += ", " + utostr(BLOCK_FIELD_IS_BYREF) + "/*BLOCK_FIELD_IS_BYREF*/);";
else
- S += ", " + utostr(BLOCK_FIELD_IS_OBJECT) + "/*BLOCK_FIELD_IS_OBJECT*/);";
+ S += ", " + utostr(BLOCK_FIELD_IS_BLOCK) + "/*BLOCK_FIELD_IS_BLOCK*/);";
}
S += "}\n";
return S;
OpenPOWER on IntegriCloud