1 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp
index 196d5e1eb36..e7d9a2d642c 100644
--- a/clang/lib/Analysis/ThreadSafety.cpp
+++ b/clang/lib/Analysis/ThreadSafety.cpp
@@ -1794,9 +1794,12 @@ void BuildLockset::warnIfMutexHeld(const NamedDecl *D, Expr* Exp,
   }
 
   LockData* LDat = FSet.findLock(Analyzer->FactMan, Mutex);
-  if (LDat)
-    Analyzer->Handler.handleFunExcludesLock(D->getName(), Mutex.toString(),
+  if (LDat) {
+    std::string DeclName = D->getNameAsString();
+    StringRef   DeclNameSR (DeclName);
+    Analyzer->Handler.handleFunExcludesLock(DeclNameSR, Mutex.toString(),
                                             Exp->getExprLoc());
+  }
 }