Merge "ART: Ensure minimum stack size under ASAN"

1 files changed, 7 insertions, 0 deletions

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 388c69e6aa..3c5569fe05 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -504,6 +504,13 @@ static size_t FixStackSize(size_t stack_size) {
   // so include that here to support apps that expect large native stacks.
   stack_size += 1 * MB;
 
+  // Under sanitization, frames of the interpreter may become bigger, both for C code as
+  // well as the ShadowFrame. Ensure a larger minimum size. Otherwise initialization
+  // of all core classes cannot be done in all test circumstances.
+  if (kMemoryToolIsAvailable) {
+    stack_size = std::max(2 * MB, stack_size);
+  }
+
   // It's not possible to request a stack smaller than the system-defined PTHREAD_STACK_MIN.
   if (stack_size < PTHREAD_STACK_MIN) {
     stack_size = PTHREAD_STACK_MIN;