diff options
| author | 2014-07-14 16:39:07 +0100 | |
|---|---|---|
| committer | 2014-07-14 17:04:46 +0100 | |
| commit | 86c1b70f08751369f77ac145430767ff26a355be (patch) | |
| tree | cf06eb4d996b6e7c26f6ee3e4a34bc1806a2cd77 | |
| parent | cf90ba7ebe00346651f3b7ce1e5b1f785f7caabd (diff) | |
x86 needs a bit more stack to handle stack overflows.
With the interpreter, 018-stack-overflow fails when being run
command line. Through make, we're not seeing any failure because
make gives a 2GB stack space. However, running run-test in the
shell, the stack space is 8MB, and the reserved space is not enough.
Change-Id: I0da12402cdfe5ad090f34c16aa6cb8d5fbc7a3ea
| -rw-r--r-- | runtime/instruction_set.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h index 6e10a4c036..dce1c150ba 100644 --- a/runtime/instruction_set.h +++ b/runtime/instruction_set.h @@ -181,7 +181,7 @@ static constexpr size_t kArm64StackOverflowReservedBytes = 32 * KB; // TODO: Bumped to workaround regression (http://b/14982147) Specifically to fix: // test-art-host-run-test-interpreter-018-stack-overflow // test-art-host-run-test-interpreter-107-int-math2 -static constexpr size_t kX86StackOverflowReservedBytes = 24 * KB; +static constexpr size_t kX86StackOverflowReservedBytes = (kIsDebugBuild ? 32 : 24) * KB; static constexpr size_t kX86_64StackOverflowReservedBytes = 32 * KB; static constexpr size_t GetStackOverflowReservedBytes(InstructionSet isa) { |