Merge commit '6c6ccc72a612' from llvm.org/main into next

Author: git apple-llvm automerger

clang-tools-extra/clangd/unittests/SerializationTests.cpp

@@ -306,8 +306,9 @@ TEST(SerializationTest, CmdlTest) {
 }
 
 // rlimit is part of POSIX.
-// ASan uses a lot of address space, so we can't apply strict limits.
-#if LLVM_ON_UNIX && !LLVM_ADDRESS_SANITIZER_BUILD
+// Sanitizers use a lot of address space, so we can't apply strict limits.
+#if LLVM_ON_UNIX && !LLVM_ADDRESS_SANITIZER_BUILD &&                           \
+    !LLVM_MEMORY_SANITIZER_BUILD
 class ScopedMemoryLimit {
   struct rlimit OriginalLimit;
   bool Succeeded = false;