From fbc266465ed3585efdbd8e9ebf71e97ce7e8b464 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 28 Jul 2024 01:34:35 +0200 Subject: Merge llvm-project main llvmorg-19-init-18630-gf2ccf80136a0 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-19-init-18630-gf2ccf80136a0, the last commit before the upstream release/19.x branch was created. PR: 280562 MFC after: 1 month (cherry picked from commit 0fca6ea1d4eea4c934cfff25ac9ee8ad6fe95583) --- contrib/llvm-project/llvm/lib/Support/CodeGenCoverage.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'contrib/llvm-project/llvm/lib/Support/CodeGenCoverage.cpp') diff --git a/contrib/llvm-project/llvm/lib/Support/CodeGenCoverage.cpp b/contrib/llvm-project/llvm/lib/Support/CodeGenCoverage.cpp index 0df45b4ff2ba..2e35019e12c1 100644 --- a/contrib/llvm-project/llvm/lib/Support/CodeGenCoverage.cpp +++ b/contrib/llvm-project/llvm/lib/Support/CodeGenCoverage.cpp @@ -21,8 +21,6 @@ using namespace llvm; -static sys::SmartMutex OutputMutex; - CodeGenCoverage::CodeGenCoverage() = default; void CodeGenCoverage::setCovered(uint64_t RuleID) { @@ -53,7 +51,7 @@ bool CodeGenCoverage::parse(MemoryBuffer &Buffer, StringRef BackendName) { if (CurPtr == Buffer.getBufferEnd()) return false; // Data is invalid, expected rule id's to follow. - bool IsForThisBackend = BackendName.equals(LexedBackendName); + bool IsForThisBackend = BackendName == LexedBackendName; while (CurPtr != Buffer.getBufferEnd()) { if (std::distance(CurPtr, Buffer.getBufferEnd()) < 8) return false; // Data is invalid. Not enough bytes for another rule id. @@ -79,6 +77,7 @@ bool CodeGenCoverage::parse(MemoryBuffer &Buffer, StringRef BackendName) { bool CodeGenCoverage::emit(StringRef CoveragePrefix, StringRef BackendName) const { if (!CoveragePrefix.empty() && !RuleCoverage.empty()) { + static sys::SmartMutex OutputMutex; sys::SmartScopedLock Lock(OutputMutex); // We can handle locking within a process easily enough but we don't want to -- cgit v1.2.3