[llvm] a558ebb - Reinstate gtest fix from 4f0b0bf5c6731e3d370558be08c9261801263b09

Benjamin Kramer via llvm-commits llvm-commits at lists.llvm.org
Fri May 14 15:36:07 PDT 2021


Author: Benjamin Kramer
Date: 2021-05-15T00:35:53+02:00
New Revision: a558ebbd6f92457be0cd399b166886ea6d8ffb14

URL: https://github.com/llvm/llvm-project/commit/a558ebbd6f92457be0cd399b166886ea6d8ffb14
DIFF: https://github.com/llvm/llvm-project/commit/a558ebbd6f92457be0cd399b166886ea6d8ffb14.diff

LOG: Reinstate gtest fix from 4f0b0bf5c6731e3d370558be08c9261801263b09

I missed this when merging gtest 1.10.0, breaking all asan tests :|

Added: 
    

Modified: 
    llvm/utils/unittest/googletest/src/gtest-death-test.cc

Removed: 
    


################################################################################
diff  --git a/llvm/utils/unittest/googletest/src/gtest-death-test.cc b/llvm/utils/unittest/googletest/src/gtest-death-test.cc
index da09a1cfc23a5..5d1031bea2570 100644
--- a/llvm/utils/unittest/googletest/src/gtest-death-test.cc
+++ b/llvm/utils/unittest/googletest/src/gtest-death-test.cc
@@ -1364,7 +1364,7 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
 
   if (!use_fork) {
     static const bool stack_grows_down = StackGrowsDown();
-    const auto stack_size = static_cast<size_t>(getpagesize());
+    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
     void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
                              MAP_ANON | MAP_PRIVATE, -1, 0);


        


More information about the llvm-commits mailing list