4 files changed, 7 insertions, 6 deletions
diff --git a/llvm/unittests/CAS/CASTestConfig.cpp b/llvm/unittests/CAS/CASTestConfig.cpp
index 91d0970..10e4b68 100644
--- a/llvm/unittests/CAS/CASTestConfig.cpp
+++ b/llvm/unittests/CAS/CASTestConfig.cpp
@@ -9,6 +9,7 @@
 #include "CASTestConfig.h"
 #include "llvm/CAS/ObjectStore.h"
 #include "gtest/gtest.h"
+#include <mutex>
 
 using namespace llvm;
 using namespace llvm::cas;
diff --git a/llvm/unittests/CAS/OnDiskCommonUtils.h b/llvm/unittests/CAS/OnDiskCommonUtils.h
index 57c8c22..89f93e0 100644
--- a/llvm/unittests/CAS/OnDiskCommonUtils.h
+++ b/llvm/unittests/CAS/OnDiskCommonUtils.h
@@ -45,7 +45,7 @@ inline HashType digest(StringRef Data) {
 }
 
 inline ValueType valueFromString(StringRef S) {
-  ValueType Val;
+  ValueType Val = {};
   llvm::copy(S.substr(0, sizeof(Val)), Val.data());
   return Val;
 }
diff --git a/llvm/unittests/CAS/OnDiskGraphDBTest.cpp b/llvm/unittests/CAS/OnDiskGraphDBTest.cpp
index 58f5dcc6..3c2e963 100644
--- a/llvm/unittests/CAS/OnDiskGraphDBTest.cpp
+++ b/llvm/unittests/CAS/OnDiskGraphDBTest.cpp
@@ -283,7 +283,7 @@ TEST_F(OnDiskCASTest, OnDiskGraphDBFaultInPolicyConflict) {
                            OnDiskGraphDB::FaultInPolicy::SingleNode);
 }
 
-#if defined(EXPENSIVE_CHECKS)
+#if defined(EXPENSIVE_CHECKS) && !defined(_WIN32)
 TEST_F(OnDiskCASTest, OnDiskGraphDBSpaceLimit) {
   setMaxOnDiskCASMappingSize();
   unittest::TempDir Temp("ondiskcas", /*Unique=*/true);
diff --git a/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp b/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp
index 89c03b8..41512d0 100644
--- a/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp
+++ b/llvm/unittests/CAS/OnDiskKeyValueDBTest.cpp
@@ -33,13 +33,13 @@ TEST_F(OnDiskCASTest, OnDiskKeyValueDBTest) {
   }
 
   ValueType ValW = valueFromString("world");
-  ArrayRef<char> Val;
+  std::optional<ArrayRef<char>> Val;
   ASSERT_THAT_ERROR(DB->put(digest("hello"), ValW).moveInto(Val), Succeeded());
-  EXPECT_EQ(Val, ArrayRef(ValW));
+  EXPECT_EQ(*Val, ArrayRef(ValW));
   ASSERT_THAT_ERROR(
       DB->put(digest("hello"), valueFromString("other")).moveInto(Val),
       Succeeded());
-  EXPECT_EQ(Val, ArrayRef(ValW));
+  EXPECT_EQ(*Val, ArrayRef(ValW));
 
   {
     std::optional<ArrayRef<char>> Val;
@@ -65,7 +65,7 @@ TEST_F(OnDiskCASTest, OnDiskKeyValueDBTest) {
     // Insert a lot of entries.
     for (unsigned I = 0; I < 1024 * 100; ++I) {
       std::string Index = Twine(I).str();
-      ArrayRef<char> Val;
+      std::optional<ArrayRef<char>> Val;
       ASSERT_THAT_ERROR(
           DB->put(digest(Index), valueFromString(Index)).moveInto(Val),
           Succeeded());