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

ObjectiveC migrator: minor refactoring of my last 

cf annotation patch.

llvm-svn: 189420
This commit is contained in:
Fariborz Jahanian 2013-08-27 23:56:54 +00:00
parent 9d1daa87e7
commit 7ca1d30e49
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clang/lib/ARCMigrate/ObjCMT.cpp
View File

@ -57,9 +57,9 @@ class ObjCMigrateASTConsumer : public ASTConsumer {
void migrateCFAnnotation(ASTContext &Ctx, const Decl *Decl);
void AddCFAnnotations(ASTContext &Ctx, const CallEffects &CE,
const FunctionDecl *FuncDecl);
const FunctionDecl *FuncDecl, bool ResultAnnotated);
void AddCFAnnotations(ASTContext &Ctx, const CallEffects &CE,
const ObjCMethodDecl *MethodDecl);
const ObjCMethodDecl *MethodDecl, bool ResultAnnotated);
void AnnotateImplicitBridging(ASTContext &Ctx);
@ -868,10 +868,10 @@ void ObjCMigrateASTConsumer::migrateCFAnnotation(ASTContext &Ctx, const Decl *De
void ObjCMigrateASTConsumer::AddCFAnnotations(ASTContext &Ctx,
const CallEffects &CE,
const FunctionDecl *FuncDecl) {
const FunctionDecl *FuncDecl,
bool ResultAnnotated) {
// Annotate function.
if (!FuncDecl->getAttr<CFReturnsRetainedAttr>() &&
!FuncDecl->getAttr<CFReturnsNotRetainedAttr>()) {
if (!ResultAnnotated) {
RetEffect Ret = CE.getReturnValue();
const char *AnnotationString = 0;
if (Ret.getObjKind() == RetEffect::CF && Ret.isOwned()) {
@ -947,7 +947,7 @@ ObjCMigrateASTConsumer::CF_BRIDGING_KIND
else {
QualType AT = pd->getType();
if (!AuditedType(AT)) {
AddCFAnnotations(Ctx, CE, FuncDecl);
AddCFAnnotations(Ctx, CE, FuncDecl, FuncIsReturnAnnotated);
return CF_BRIDGING_NONE;
}
}
@ -974,10 +974,10 @@ void ObjCMigrateASTConsumer::migrateARCSafeAnnotation(ASTContext &Ctx,
void ObjCMigrateASTConsumer::AddCFAnnotations(ASTContext &Ctx,
const CallEffects &CE,
const ObjCMethodDecl *MethodDecl) {
const ObjCMethodDecl *MethodDecl,
bool ResultAnnotated) {
// Annotate function.
if (!MethodDecl->getAttr<CFReturnsRetainedAttr>() &&
!MethodDecl->getAttr<CFReturnsNotRetainedAttr>()) {
if (!ResultAnnotated) {
RetEffect Ret = CE.getReturnValue();
const char *AnnotationString = 0;
if (Ret.getObjKind() == RetEffect::CF && Ret.isOwned()) {
@ -1052,7 +1052,7 @@ ObjCMigrateASTConsumer::CF_BRIDGING_KIND
else {
QualType AT = pd->getType();
if (!AuditedType(AT)) {
AddCFAnnotations(Ctx, CE, MethodDecl);
AddCFAnnotations(Ctx, CE, MethodDecl, MethodIsReturnAnnotated);
return CF_BRIDGING_NONE;
}
}