From 77886fc0f0754bf8d810a16a2ae5ea9db7e00a7e Mon Sep 17 00:00:00 2001
From: Tim Shen <timshen91@gmail.com>
Date: Tue, 3 Oct 2017 19:39:02 +0000
Subject: [PATCH] Revert r314820 "[Analyzer] More granular special casing in
 RetainCountChecker"

The test retain-release.m fails with this patch.

Differential Revision: https://reviews.llvm.org/D38487

llvm-svn: 314831
---
 clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp | 9 +++------
 clang/test/Analysis/retain-release.mm                    | 7 -------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
index 7212d296a122..165bc0499388 100644
--- a/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
@@ -1062,7 +1062,6 @@ RetainSummaryManager::getFunctionSummary(const FunctionDecl *FD) {
 
     // Inspect the result type.
     QualType RetTy = FT->getReturnType();
-    StringRef RetTyName = RetTy.getAsString();
 
     // FIXME: This should all be refactored into a chain of "summary lookup"
     //  filters.
@@ -1082,14 +1081,12 @@ RetainSummaryManager::getFunctionSummary(const FunctionDecl *FD) {
       AllowAnnotations = false;
     } else if (FName == "CFPlugInInstanceCreate") {
       S = getPersistentSummary(RetEffect::MakeNoRet());
-    } else if (FName == "IORegistryEntrySearchCFProperty"
-        || (RetTyName == "CFMutableDictionaryRef" && (
-               FName == "IOBSDNameMatching" ||
+    } else if (FName == "IOBSDNameMatching" ||
                FName == "IOServiceMatching" ||
                FName == "IOServiceNameMatching" ||
+               FName == "IORegistryEntrySearchCFProperty" ||
                FName == "IORegistryEntryIDMatching" ||
-               FName == "IOOpenFirmwarePathMatching"
-            ))) {
+               FName == "IOOpenFirmwarePathMatching") {
       // Part of <rdar://problem/6961230>. (IOKit)
       // This should be addressed using a API table.
       S = getPersistentSummary(RetEffect::MakeOwned(RetEffect::CF),
diff --git a/clang/test/Analysis/retain-release.mm b/clang/test/Analysis/retain-release.mm
index ac83c1a48e36..c694fd33c596 100644
--- a/clang/test/Analysis/retain-release.mm
+++ b/clang/test/Analysis/retain-release.mm
@@ -463,10 +463,3 @@ void	radar13722286::PrepareBitmap() {
 
 // rdar://34210609
 void _() { _(); }; // no-warning
-
-// Do not assume that IOBSDNameMatching increments a reference counter,
-// unless return type is CFMutableDictionaryRef.
-void* IOBSDNameMatching();
-void rdar33832412() {
-  void* x = IOBSDNameMatching(); // no-warning
-}