replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix couple of rewriter bugs related to rewriting a 

__block block declaration. //rdar://9204669

llvm-svn: 128682
This commit is contained in:
Fariborz Jahanian 2011-03-31 22:49:32 +00:00
parent 77361761fb
commit ff51d4e559
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Rewrite/RewriteObjC.cpp
View File

@ -5142,8 +5142,11 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) {
ByrefType += " void (*__Block_byref_id_object_copy)(void*, void*);\n";
ByrefType += " void (*__Block_byref_id_object_dispose)(void*);\n";
}
Ty.getAsStringInternal(Name, Context->PrintingPolicy);
QualType T = Ty;
(void)convertBlockPointerToFunctionPointer(T);
T.getAsStringInternal(Name, Context->PrintingPolicy);
ByrefType += " " + Name + ";\n";
ByrefType += "};\n";
// Insert this type in global scope. It is needed by helper function.
@ -5201,7 +5204,12 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) {
ByrefType += utostr(flag);
}
ByrefType += "};\n";
ReplaceText(DeclLoc, endBuf-startBuf+Name.size(), ByrefType);
unsigned nameSize = Name.size();
// for block or function pointer declaration. Name is aleady
// part of the declaration.
if (Ty->isBlockPointerType() || Ty->isFunctionPointerType())
nameSize = 1;
ReplaceText(DeclLoc, endBuf-startBuf+nameSize, ByrefType);
}
else {
SourceLocation startLoc;

8
clang/test/Rewriter/rewrite-block-pointer.mm
View File

@ -88,3 +88,11 @@ void test8608902() {
ppp(1, 0);
}
void test9204669() {
__attribute__((__blocks__(byref))) char (^addChangeToData)();
addChangeToData = ^() {
return 'b';
};
}