ObjectiveC migrator: minor refactoring of my last
cf annotation patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189420 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index 4fa4b1e..56a042f 100644
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -57,9 +57,9 @@
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::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 @@
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::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 @@
else {
QualType AT = pd->getType();
if (!AuditedType(AT)) {
- AddCFAnnotations(Ctx, CE, MethodDecl);
+ AddCFAnnotations(Ctx, CE, MethodDecl, MethodIsReturnAnnotated);
return CF_BRIDGING_NONE;
}
}