commit a15e1b4f631692340fc60c0590fddb9af950cdc3
author DeLesley Hutchins <delesley@google.com> Wed Sep 19 19:18:29 2012 +0000
committer DeLesley Hutchins <delesley@google.com> Wed Sep 19 19:18:29 2012 +0000
tree bf75120f81771823eb0704eed4fd08d74ee9ad33
parent 92b5940fbb49a15715fde80f6dd1221953519c7f

Thread-safety analysis: fix ICE when EXCLUSIVE_LOCKS_REQUIRED or
LOCKS_EXCLUDED is used on a method with a name that is is not a simple
identifier.

llvm-svn: 164242

clang/lib/Analysis/ThreadSafety.cpp

diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp
index 196d5e1..e7d9a2d 100644
--- a/clang/lib/Analysis/ThreadSafety.cpp
+++ b/clang/lib/Analysis/ThreadSafety.cpp
@@ -1794,9 +1794,12 @@
   }
 
   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());
+  }
 }