From 6dcad42acbd5d047ac276ca73f1dc0012a39e99e Mon Sep 17 00:00:00 2001
From: Alex Langford <alangford@apple.com>
Date: Wed, 17 May 2023 13:22:24 -0700
Subject: [PATCH] [lldb][NFCI] Clean up ThreadSafeDenseMap

- Change header guard after 147a61618989
- Fix file header
- Remove the `_MutexType` template parameter, I did not see this used
  anywhere on llvm.org or on Apple's downstream forks.
---
 lldb/include/lldb/Utility/ThreadSafeDenseMap.h | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/lldb/include/lldb/Utility/ThreadSafeDenseMap.h b/lldb/include/lldb/Utility/ThreadSafeDenseMap.h
index 2f6eb28..a64fe8d 100644
--- a/lldb/include/lldb/Utility/ThreadSafeDenseMap.h
+++ b/lldb/include/lldb/Utility/ThreadSafeDenseMap.h
@@ -1,5 +1,4 @@
-//===-- ThreadSafeDenseMap.h ------------------------------------------*- C++
-//-*-===//
+//===-- ThreadSafeDenseMap.h ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -7,19 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLDB_CORE_THREADSAFEDENSEMAP_H
-#define LLDB_CORE_THREADSAFEDENSEMAP_H
+#ifndef LLDB_UTILITY_THREADSAFEDENSEMAP_H
+#define LLDB_UTILITY_THREADSAFEDENSEMAP_H
 
 #include <mutex>
 
 #include "llvm/ADT/DenseMap.h"
 
-
 namespace lldb_private {
 
-template <typename _KeyType, typename _ValueType,
-          typename _MutexType = std::mutex>
-class ThreadSafeDenseMap {
+template <typename _KeyType, typename _ValueType> class ThreadSafeDenseMap {
 public:
   typedef llvm::DenseMap<_KeyType, _ValueType> LLVMMapType;
 
@@ -27,22 +23,22 @@ public:
       : m_map(map_initial_capacity), m_mutex() {}
 
   void Insert(_KeyType k, _ValueType v) {
-    std::lock_guard<_MutexType> guard(m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     m_map.insert(std::make_pair(k, v));
   }
 
   void Erase(_KeyType k) {
-    std::lock_guard<_MutexType> guard(m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     m_map.erase(k);
   }
 
   _ValueType Lookup(_KeyType k) {
-    std::lock_guard<_MutexType> guard(m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     return m_map.lookup(k);
   }
 
   bool Lookup(_KeyType k, _ValueType &v) {
-    std::lock_guard<_MutexType> guard(m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     auto iter = m_map.find(k), end = m_map.end();
     if (iter == end)
       return false;
@@ -51,15 +47,15 @@ public:
   }
 
   void Clear() {
-    std::lock_guard<_MutexType> guard(m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     m_map.clear();
   }
 
 protected:
   LLVMMapType m_map;
-  _MutexType m_mutex;
+  std::mutex m_mutex;
 };
 
 } // namespace lldb_private
 
-#endif // LLDB_CORE_THREADSAFEDENSEMAP_H
+#endif // LLDB_UTILITY_THREADSAFEDENSEMAP_H
-- 
2.7.4