commit 24a44bfd6b9f87239dc72f9347f2fbd309c69bcb
author Fangrui Song <i@maskray.me> Sat Aug 06 01:00:06 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Aug 06 01:06:07 2022 -0700
tree 2f201f59a57eeb2f3be52d7bfd3a7401bd53073d
parent 604f4100e4edc117ceac7e358c9d273555aa66e6

[ELF] toString(const InputFile *): synchronize toStringCache

The function may be called currently for diagnostics.

GitOrigin-RevId: e45a5696bb2ae5d12ada5000135e45366f6582b1

ELF/InputFiles.cpp

diff --git a/ELF/InputFiles.cpp b/ELF/InputFiles.cpp
index 3650065..c0961b4 100644
--- a/ELF/InputFiles.cpp
+++ b/ELF/InputFiles.cpp
@@ -47,14 +47,18 @@
 
 // Returns "<internal>", "foo.a(bar.o)" or "baz.o".
 std::string lld::toString(const InputFile *f) {
+  static std::mutex mu;
   if (!f)
     return "<internal>";
 
-  if (f->toStringCache.empty()) {
-    if (f->archiveName.empty())
-      f->toStringCache = f->getName();
-    else
-      (f->archiveName + "(" + f->getName() + ")").toVector(f->toStringCache);
+  {
+    std::lock_guard<std::mutex> lock(mu);
+    if (f->toStringCache.empty()) {
+      if (f->archiveName.empty())
+        f->toStringCache = f->getName();
+      else
+        (f->archiveName + "(" + f->getName() + ")").toVector(f->toStringCache);
+    }
   }
   return std::string(f->toStringCache);
 }