Author: Rainer Orth Date: 2026-07-28T11:16:16+02:00 New Revision: f181815b8e094287ba4ac36e5b8127fcda34e49f
URL: https://github.com/llvm/llvm-project/commit/f181815b8e094287ba4ac36e5b8127fcda34e49f DIFF: https://github.com/llvm/llvm-project/commit/f181815b8e094287ba4ac36e5b8127fcda34e49f.diff LOG: [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) Added: Modified: llvm/unittests/CAS/OnDiskCASLoggerTest.cpp Removed: ################################################################################ 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); _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
