mike-lischke#139 Make global mutable state thread_local

Signed-off-by: vityaman <[email protected]>
vityaman · Aug 8, 2024 · 5b8a86c · 5b8a86c
1 parent 58e4ea0
commit 5b8a86c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp
@@ -58,7 +58,7 @@ std::vector<size_t> longestCommonPrefix(
 
 }  // namespace
 
-std::unordered_map<std::type_index, CodeCompletionCore::FollowSetsPerState>  // NOLINT
+thread_local std::unordered_map<std::type_index, CodeCompletionCore::FollowSetsPerState>  // NOLINT
     CodeCompletionCore::followSetsByATN = {};
 
 // Matches ATNStateType enum

diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp
@@ -192,7 +192,7 @@ class CodeCompletionCore {
   CandidatesCollection collectCandidates(size_t caretTokenIndex, Parameters parameters = {});
 
 private:
-  static std::unordered_map<std::type_index, FollowSetsPerState> followSetsByATN;
+  static thread_local std::unordered_map<std::type_index, FollowSetsPerState> followSetsByATN;
   static std::vector<std::string> atnStateTypeMap;
 
   antlr4::Parser* parser;