Index: lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
===================================================================
--- lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
+++ lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
@@ -1062,6 +1062,10 @@
 
     // Inspect the result type.
     QualType RetTy = FT->getReturnType();
+    StringRef RetTyName;
+    if (RetTy.getBaseTypeIdentifier() != nullptr) {
+      RetTyName = RetTy.getBaseTypeIdentifier()->getName();
+    }
 
     // FIXME: This should all be refactored into a chain of "summary lookup"
     //  filters.
@@ -1081,12 +1085,14 @@
       AllowAnnotations = false;
     } else if (FName == "CFPlugInInstanceCreate") {
       S = getPersistentSummary(RetEffect::MakeNoRet());
-    } else if (FName == "IOBSDNameMatching" ||
+    } else if (FName == "IORegistryEntrySearchCFProperty"
+        || (RetTyName == "__CFDictionary" && (
+               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),
Index: test/Analysis/retain-release.mm
===================================================================
--- test/Analysis/retain-release.mm
+++ test/Analysis/retain-release.mm
@@ -463,3 +463,10 @@
 
 // rdar://34210609
 void _() { _(); }; // no-warning
+
+// Take return type into account when assuming IOBSDNameMatching increments
+// a reference counter.
+void* IOBSDNameMatching();
+void rdar33832412() {
+  void* x = IOBSDNameMatching();
+}