Roll clang 277962:278861

base/threading/thread_unittest.cc

Index: base/threading/thread_unittest.cc
diff --git a/base/threading/thread_unittest.cc b/base/threading/thread_unittest.cc
index 481ac4b8d8614c2636b509ee2dd3afb119f07f6f..e15c40b96a36365d21db3df22eb0d7628f0dcde7 100644
--- a/base/threading/thread_unittest.cc
+++ b/base/threading/thread_unittest.cc
@@ -137,8 +137,9 @@ TEST_F(ThreadTest, StartWithOptions_StackSize) {
   // Ensure that the thread can work with only 12 kb and still process a
   // message.
   Thread::Options options;
-#if defined(ADDRESS_SANITIZER)
-  // ASan bloats the stack variables and overflows the 12 kb stack.
+#if defined(ADDRESS_SANITIZER) || !defined(NDEBUG)
+  // ASan bloats the stack variables and overflows the 12 kb stack. Some debug
+  // builds also grow the stack too much.
   options.stack_size = 24*1024;
 #else
   options.stack_size = 12*1024;