commit 5b280f28351bbdc103cc50d3b0f52f92d286fa0a
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 55e1e1ce8256a7cc8f16e6ca67b1998b6ed89cd5
parent 1deeedb6808c6a2aa24de6317960199f04012345

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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164242 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Analysis/ThreadSafety.cpp

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