1 files changed, 8 insertions, 2 deletions
diff --git a/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp b/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
index 551aea5021..7ffbc7fc4f 100644
--- a/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
@@ -167,8 +167,14 @@ unsigned MacOSKeychainAPIChecker::getTrackedFunctionIndex(StringRef Name,
 
 static SymbolRef getSymbolForRegion(CheckerContext &C,
                                    const MemRegion *R) {
-  if (!isa<SymbolicRegion>(R))
-    return 0;
+  if (!isa<SymbolicRegion>(R)) {
+    // Implicit casts (ex: void* -> char*) can turn Symbolic region into element
+    // region, if that is the case, get the underlining region.
+    if (const ElementRegion *ER = dyn_cast<ElementRegion>(R))
+      R = ER->getAsArrayOffset().getRegion();
+    else
+      return 0;
+  }
   return cast<SymbolicRegion>(R)->getSymbol();
 }