From d9b7092a874a93b03e37a36718f76f3a1ab8da9f Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 6 Aug 2019 14:35:06 +0200
Subject: [PATCH] Clang: Use no mutex in copyable file path cache

We use it in worker threads and there should be no access from different
threads.

Change-Id: I62874761221c45f88ce4d7cfda4fbda4bc446cac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/clangsupport/filepathcache.h   | 29 ++++++++++++++++++-------
 src/libs/clangsupport/filepathcaching.h |  4 ++--
 src/libs/clangsupport/stringcache.h     | 27 ++++++++++++++++++-----
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/libs/clangsupport/filepathcache.h b/src/libs/clangsupport/filepathcache.h
index 1771f5b6c3a..2faef6e5037 100644
--- a/src/libs/clangsupport/filepathcache.h
+++ b/src/libs/clangsupport/filepathcache.h
@@ -37,28 +37,31 @@
 
 namespace ClangBackEnd {
 
-template <typename FilePathStorage>
+template<typename FilePathStorage, typename Mutex = SharedMutex>
 class CLANGSUPPORT_GCCEXPORT FilePathCache
 {
+    FilePathCache(const FilePathCache &) = default;
+    FilePathCache &operator=(const FilePathCache &) = default;
+
+    template<typename Storage, typename M>
+    friend class FilePathCache;
+
+public:
     using DirectoryPathCache = StringCache<Utils::PathString,
                                            Utils::SmallStringView,
                                            int,
-                                           SharedMutex,
+                                           Mutex,
                                            decltype(&Utils::reverseCompare),
                                            Utils::reverseCompare,
                                            Sources::Directory>;
     using FileNameCache = StringCache<FileNameEntry,
                                       FileNameView,
                                       int,
-                                      SharedMutex,
+                                      Mutex,
                                       decltype(&FileNameView::compare),
                                       FileNameView::compare,
                                       Sources::Source>;
 
-    FilePathCache(const FilePathCache &) = default;
-    FilePathCache &operator=(const FilePathCache &) = default;
-
-public:
     FilePathCache(FilePathStorage &filePathStorage)
         : m_filePathStorage(filePathStorage)
     {
@@ -69,7 +72,17 @@ public:
     FilePathCache(FilePathCache &&) = default;
     FilePathCache &operator=(FilePathCache &&) = default;
 
-    FilePathCache clone() { return *this; }
+    template<typename Cache>
+    Cache clone()
+    {
+        using DirectoryPathCache = typename Cache::DirectoryPathCache;
+        using FileNameCache = typename Cache::FileNameCache;
+        Cache cache{m_filePathStorage};
+        cache.m_directoryPathCache = m_directoryPathCache.template clone<DirectoryPathCache>();
+        cache.m_fileNameCache = m_fileNameCache.template clone<FileNameCache>();
+
+        return cache;
+    }
 
     FilePathId filePathId(FilePathView filePath) const
     {
diff --git a/src/libs/clangsupport/filepathcaching.h b/src/libs/clangsupport/filepathcaching.h
index 1ca6522752e..8bbbe0e43e0 100644
--- a/src/libs/clangsupport/filepathcaching.h
+++ b/src/libs/clangsupport/filepathcaching.h
@@ -66,11 +66,11 @@ class CLANGSUPPORT_EXPORT CopyableFilePathCaching final : public FilePathCaching
 {
     using Factory = FilePathStorageSqliteStatementFactory<Sqlite::Database>;
     using Storage = FilePathStorage<Factory>;
-    using Cache = FilePathCache<Storage>;
+    using Cache = FilePathCache<Storage, NonLockingMutex>;
 
 public:
     CopyableFilePathCaching(FilePathCaching &cache)
-        : m_cache(cache.m_cache.clone())
+        : m_cache(cache.m_cache.clone<Cache>())
     {}
 
     FilePathId filePathId(FilePathView filePath) const override;
diff --git a/src/libs/clangsupport/stringcache.h b/src/libs/clangsupport/stringcache.h
index 5d416a46c40..5a1ea8fd354 100644
--- a/src/libs/clangsupport/stringcache.h
+++ b/src/libs/clangsupport/stringcache.h
@@ -101,6 +101,9 @@ template<typename StringType,
          typename CacheEntry = StringCacheEntry<StringType, StringViewType, IndexType>>
 class StringCache
 {
+    template<typename T, typename V, typename I, typename M, typename C, C c, typename CE>
+    friend class StringCache;
+
 public:
     using CacheEntries = std::vector<CacheEntry>;
     using const_iterator = typename CacheEntries::const_iterator;
@@ -116,12 +119,26 @@ public:
         : m_strings(other.m_strings)
         , m_indices(other.m_indices)
     {}
-    StringCache &operator=(const StringCache &other)
+
+    template<typename Cache>
+    Cache clone()
     {
-        if (*this != other) {
-            m_strings = other.m_strings;
-            m_indices = other.m_indices;
-        }
+        Cache cache;
+        cache.m_strings = m_strings;
+        cache.m_indices = m_indices;
+
+        return cache;
+    }
+
+    StringCache(StringCache &&other)
+        : m_strings(std::move(other.m_strings))
+        , m_indices(std::move(other.m_indices))
+    {}
+
+    StringCache &operator=(StringCache &&other)
+    {
+        m_strings = std::move(other.m_strings);
+        m_indices = std::move(other.m_indices);
 
         return *this;
     }