[llvm-branch-commits] [llvm] release/23.x: [llvm][cas] Fix OnDiskCASLoggerTest.cpp compilation on NetBSD (#212113) (PR #212191)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Jul 27 01:04:11 PDT 2026
https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/212191
Backport 102f572
Requested by: @rorth
>From af7dc06067f10895ce404ba25c37c1eaad816dff Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro at gcc.gnu.org>
Date: Mon, 27 Jul 2026 09:55:54 +0200
Subject: [PATCH] [llvm][cas] Fix OnDiskCASLoggerTest.cpp compilation on NetBSD
(#212113)
`CAS/OnDiskCASLoggerTest.cpp` doesn't compile on NetBSD/amd64:
```
In member function `virtual void OnDiskCASLoggerTest_MultiProcess_Test::TestBody()':
llvm/unittests/CAS/OnDiskCASLoggerTest.cpp:230:19: error: reference to `Wait' is ambiguous
230 | auto Result = Wait(PI, /*Timeout=*/15, &Error);
| ^~~~
In file included from llvm/unittests/CAS/OnDiskCASLoggerTest.cpp:15:
llvm/include/llvm/Support/Program.h:212:22: note: candidates are: `llvm::sys::ProcessInfo llvm::sys::Wait(const llvm::sys::ProcessInfo&, std::optional<unsigned int>, std::string*, std::optional<llvm::sys::ProcessStatistics>*, bool)'
212 | LLVM_ABI ProcessInfo Wait(
| ^~~~
In file included from llvm/include/llvm/Support/RWMutex.h:17,
from llvm/include/llvm/Support/ThreadPool.h:21,
from llvm/unittests/CAS/OnDiskCASLoggerTest.cpp:16:
llvm/include/llvm/Support/Threading.h:60:40: note: `llvm::InitStatus llvm::Wait'
60 | enum InitStatus { Uninitialized = 0, Wait = 1, Done = 2 };
| ^~~~
```
This patch removes the ambiguity, matching other uses.
Tested on `amd64-pc-netbsd10.1` and `x86_64-pc-linux-gnu`.
(cherry picked from commit 102f572188c5dbf89d92bf533a4bdc4fed1d89bd)
---
llvm/unittests/CAS/OnDiskCASLoggerTest.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/unittests/CAS/OnDiskCASLoggerTest.cpp b/llvm/unittests/CAS/OnDiskCASLoggerTest.cpp
index 7357a976f5f50..61cd5d013eeb7 100644
--- a/llvm/unittests/CAS/OnDiskCASLoggerTest.cpp
+++ b/llvm/unittests/CAS/OnDiskCASLoggerTest.cpp
@@ -227,7 +227,7 @@ TEST_F(OnDiskCASLoggerTest, MultiProcess) {
for (auto &PI : PIs) {
// Note: this is typically <1 second, but account for slow CI systems.
- auto Result = Wait(PI, /*Timeout=*/15, &Error);
+ auto Result = llvm::sys::Wait(PI, /*Timeout=*/15, &Error);
ASSERT_TRUE(Error.empty()) << Error;
ASSERT_EQ(Result.Pid, PI.Pid);
ASSERT_EQ(Result.ReturnCode, 0);
More information about the llvm-branch-commits
mailing list