summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2010-01-05 18:15:57 +0000
committerFariborz Jahanian <fjahanian@apple.com>2010-01-05 18:15:57 +0000
commitf79454347262d4da2acbdb4832e838d64f9da116 (patch)
tree7396fafc7caf2561837a34f36434ad575648248e /clang/lib
parent54f4e39956577c1e3ba75697ffd135e9fdb56d9b (diff)
downloadbcm5719-llvm-f79454347262d4da2acbdb4832e838d64f9da116.tar.gz
bcm5719-llvm-f79454347262d4da2acbdb4832e838d64f9da116.zip
Minor clean up.
llvm-svn: 92746
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Frontend/RewriteObjC.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/clang/lib/Frontend/RewriteObjC.cpp b/clang/lib/Frontend/RewriteObjC.cpp
index 419011e3c86..253e0816581 100644
--- a/clang/lib/Frontend/RewriteObjC.cpp
+++ b/clang/lib/Frontend/RewriteObjC.cpp
@@ -4508,14 +4508,14 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) {
// {0, &ND, some_flag, __size=sizeof(struct __Block_byref_ND),
// initializer-if-any};
bool hasInit = (ND->getInit() != 0);
+ unsigned flags = 0;
+ if (HasCopyAndDispose)
+ flags |= BLOCK_HAS_COPY_DISPOSE;
Name = ND->getNameAsString();
ByrefType = "struct __Block_byref_" + Name;
if (!hasInit) {
ByrefType += " " + Name + " = ";
ByrefType += "{0, &" + Name + ", ";
- unsigned flags = 0;
- if (HasCopyAndDispose)
- flags |= BLOCK_HAS_COPY_DISPOSE;
ByrefType += utostr(flags);
ByrefType += ", ";
ByrefType += "sizeof(struct __Block_byref_" + Name + ")";
@@ -4535,9 +4535,6 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) {
ReplaceText(DeclLoc, endBuf-startBuf,
ByrefType.c_str(), ByrefType.size());
ByrefType = " = {0, &" + Name + ", ";
- unsigned flags = 0;
- if (HasCopyAndDispose)
- flags |= BLOCK_HAS_COPY_DISPOSE;
ByrefType += utostr(flags);
ByrefType += ", ";
ByrefType += "sizeof(struct __Block_byref_" + Name + "), ";
OpenPOWER on IntegriCloud