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

objc modern rewriter: minor refactoring. 

llvm-svn: 155449
This commit is contained in:
Fariborz Jahanian 2012-04-24 16:45:27 +00:00
parent fe0675927d
commit 3fd9bbd41e
1 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
clang/lib/Rewrite/RewriteModernObjC.cpp
View File

@ -4787,11 +4787,11 @@ void RewriteModernObjC::RewriteByRefVar(VarDecl *ND) {
FunLocStart = CurMethodDef->getLocStart(); FunLocStart = CurMethodDef->getLocStart();
} }
InsertText(FunLocStart, ByrefType); InsertText(FunLocStart, ByrefType);
if (Ty.isObjCGCWeak()) { if (Ty.isObjCGCWeak()) {
flag |= BLOCK_FIELD_IS_WEAK; flag |= BLOCK_FIELD_IS_WEAK;
isa = 1; isa = 1;
} }
if (HasCopyAndDispose) { if (HasCopyAndDispose) {
flag = BLOCK_BYREF_CALLER; flag = BLOCK_BYREF_CALLER;
QualType Ty = ND->getType(); QualType Ty = ND->getType();
@ -4821,21 +4821,22 @@ void RewriteModernObjC::RewriteByRefVar(VarDecl *ND) {
RewriteByRefString(ByrefType, Name, ND); RewriteByRefString(ByrefType, Name, ND);
std::string ForwardingCastType("("); std::string ForwardingCastType("(");
ForwardingCastType += ByrefType + " *)"; ForwardingCastType += ByrefType + " *)";
ByrefType += " " + Name + " = {(void*)";
ByrefType += utostr(isa);
ByrefType += "," + ForwardingCastType + "&" + Name + ", ";
ByrefType += utostr(flags);
ByrefType += ", ";
ByrefType += "sizeof(";
RewriteByRefString(ByrefType, Name, ND);
ByrefType += ")";
if (HasCopyAndDispose) {
ByrefType += ", __Block_byref_id_object_copy_";
ByrefType += utostr(flag);
ByrefType += ", __Block_byref_id_object_dispose_";
ByrefType += utostr(flag);
}
if (!hasInit) { if (!hasInit) {
ByrefType += " " + Name + " = {(void*)";
ByrefType += utostr(isa);
ByrefType += "," + ForwardingCastType + "&" + Name + ", ";
ByrefType += utostr(flags);
ByrefType += ", ";
ByrefType += "sizeof(";
RewriteByRefString(ByrefType, Name, ND);
ByrefType += ")";
if (HasCopyAndDispose) {
ByrefType += ", __Block_byref_id_object_copy_";
ByrefType += utostr(flag);
ByrefType += ", __Block_byref_id_object_dispose_";
ByrefType += utostr(flag);
}
ByrefType += "};\n"; ByrefType += "};\n";
unsigned nameSize = Name.size(); unsigned nameSize = Name.size();
// for block or function pointer declaration. Name is aleady // for block or function pointer declaration. Name is aleady
@ -4845,6 +4846,7 @@ void RewriteModernObjC::RewriteByRefVar(VarDecl *ND) {
ReplaceText(DeclLoc, endBuf-startBuf+nameSize, ByrefType); ReplaceText(DeclLoc, endBuf-startBuf+nameSize, ByrefType);
} }
else { else {
ByrefType += ", ";
SourceLocation startLoc; SourceLocation startLoc;
Expr *E = ND->getInit(); Expr *E = ND->getInit();
if (const CStyleCastExpr *ECE = dyn_cast<CStyleCastExpr>(E)) if (const CStyleCastExpr *ECE = dyn_cast<CStyleCastExpr>(E))
@ -4853,22 +4855,6 @@ void RewriteModernObjC::RewriteByRefVar(VarDecl *ND) {
startLoc = E->getLocStart(); startLoc = E->getLocStart();
startLoc = SM->getExpansionLoc(startLoc); startLoc = SM->getExpansionLoc(startLoc);
endBuf = SM->getCharacterData(startLoc); endBuf = SM->getCharacterData(startLoc);
ByrefType += " " + Name;
ByrefType += " = {(void*)";
ByrefType += utostr(isa);
ByrefType += "," + ForwardingCastType + "&" + Name + ", ";
ByrefType += utostr(flags);
ByrefType += ", ";
ByrefType += "sizeof(";
RewriteByRefString(ByrefType, Name, ND);
ByrefType += "), ";
if (HasCopyAndDispose) {
ByrefType += "__Block_byref_id_object_copy_";
ByrefType += utostr(flag);
ByrefType += ", __Block_byref_id_object_dispose_";
ByrefType += utostr(flag);
ByrefType += ", ";
}
ReplaceText(DeclLoc, endBuf-startBuf, ByrefType); ReplaceText(DeclLoc, endBuf-startBuf, ByrefType);
// Complete the newly synthesized compound expression by inserting a right // Complete the newly synthesized compound expression by inserting a right