diff options
| author | George Karpenkov <ekarpenkov@apple.com> | 2019-01-10 18:14:12 +0000 |
|---|---|---|
| committer | George Karpenkov <ekarpenkov@apple.com> | 2019-01-10 18:14:12 +0000 |
| commit | 9cbcc21aed12a34e358b9f86ec7932f62cd468a6 (patch) | |
| tree | 5222ee8a30ec9e8c4aefca64cabce6c503176d99 /clang/lib/ARCMigrate/ObjCMT.cpp | |
| parent | 585a210e5f69d960e6a6e25601d6576fa47cb397 (diff) | |
| download | bcm5719-llvm-9cbcc21aed12a34e358b9f86ec7932f62cd468a6.tar.gz bcm5719-llvm-9cbcc21aed12a34e358b9f86ec7932f62cd468a6.zip | |
[analyzer] [RetainCountChecker] [NFC] Remove redundant enum items *Msg, as the object type is already communicated by a separate field
Differential Revision: https://reviews.llvm.org/D56070
llvm-svn: 350859
Diffstat (limited to 'clang/lib/ARCMigrate/ObjCMT.cpp')
| -rw-r--r-- | clang/lib/ARCMigrate/ObjCMT.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp index c3f849b7fad..6950ce0e12f 100644 --- a/clang/lib/ARCMigrate/ObjCMT.cpp +++ b/clang/lib/ARCMigrate/ObjCMT.cpp @@ -1484,14 +1484,15 @@ void ObjCMigrateASTConsumer::AddCFAnnotations(ASTContext &Ctx, pe = FuncDecl->param_end(); pi != pe; ++pi, ++i) { const ParmVarDecl *pd = *pi; ArgEffect AE = AEArgs[i]; - if (AE.getKind() == DecRef && !pd->hasAttr<CFConsumedAttr>() && + if (AE.getKind() == DecRef && AE.getObjKind() == ObjKind::CF && + !pd->hasAttr<CFConsumedAttr>() && NSAPIObj->isMacroDefined("CF_CONSUMED")) { edit::Commit commit(*Editor); commit.insertBefore(pd->getLocation(), "CF_CONSUMED "); Editor->commit(commit); - } - else if (AE.getKind() == DecRefMsg && !pd->hasAttr<NSConsumedAttr>() && - NSAPIObj->isMacroDefined("NS_CONSUMED")) { + } else if (AE.getKind() == DecRef && AE.getObjKind() == ObjKind::ObjC && + !pd->hasAttr<NSConsumedAttr>() && + NSAPIObj->isMacroDefined("NS_CONSUMED")) { edit::Commit commit(*Editor); commit.insertBefore(pd->getLocation(), "NS_CONSUMED "); Editor->commit(commit); @@ -1536,8 +1537,8 @@ ObjCMigrateASTConsumer::CF_BRIDGING_KIND pe = FuncDecl->param_end(); pi != pe; ++pi, ++i) { const ParmVarDecl *pd = *pi; ArgEffect AE = AEArgs[i]; - if (AE.getKind() == DecRef /*CFConsumed annotated*/ || - AE.getKind() == IncRef) { + if ((AE.getKind() == DecRef /*CFConsumed annotated*/ || + AE.getKind() == IncRef) && AE.getObjKind() == ObjKind::CF) { if (AE.getKind() == DecRef && !pd->hasAttr<CFConsumedAttr>()) ArgCFAudited = true; else if (AE.getKind() == IncRef) @@ -1610,7 +1611,9 @@ void ObjCMigrateASTConsumer::AddCFAnnotations(ASTContext &Ctx, pe = MethodDecl->param_end(); pi != pe; ++pi, ++i) { const ParmVarDecl *pd = *pi; ArgEffect AE = AEArgs[i]; - if (AE.getKind() == DecRef && !pd->hasAttr<CFConsumedAttr>() && + if (AE.getKind() == DecRef + && AE.getObjKind() == ObjKind::CF + && !pd->hasAttr<CFConsumedAttr>() && NSAPIObj->isMacroDefined("CF_CONSUMED")) { edit::Commit commit(*Editor); commit.insertBefore(pd->getLocation(), "CF_CONSUMED "); @@ -1633,7 +1636,7 @@ void ObjCMigrateASTConsumer::migrateAddMethodAnnotation( MethodDecl->hasAttr<NSReturnsNotRetainedAttr>() || MethodDecl->hasAttr<NSReturnsAutoreleasedAttr>()); - if (CE.getReceiver().getKind() == DecRefMsg && + if (CE.getReceiver().getKind() == DecRef && !MethodDecl->hasAttr<NSConsumesSelfAttr>() && MethodDecl->getMethodFamily() != OMF_init && MethodDecl->getMethodFamily() != OMF_release && |
