diff options
| author | 2014-07-25 16:15:27 -0700 | |
|---|---|---|
| committer | 2014-08-13 09:01:41 -0700 | |
| commit | 648d7112609dd19c38131b3e71c37bcbbd19d11e (patch) | |
| tree | 54062831327c660acb309e877e8d8df9ba0c2d5d /runtime/entrypoints/entrypoint_utils.cc | |
| parent | 99c251bbd225dd97d0deece29559a430b12a0b66 (diff) | |
Reduce stack usage for overflow checks
This reduces the stack space reserved for overflow checks to 12K, split
into an 8K gap and a 4K protected region. GC needs over 8K when running
in a stack overflow situation.
Also prevents signal runaway by detecting a signal inside code that
resulted from a signal handler invokation. And adds a max signal count to
the SignalTest to prevent it running forever.
Also reduces the number of iterations for the InterfaceTest as this was
taking (almost) forever with the --trace option on run-test.
Bug: 15435566
Change-Id: Id4fd46f22d52d42a9eb431ca07948673e8fda694
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 4755b9e9db..a0e35f88fa 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -212,6 +212,11 @@ void ThrowStackOverflowError(Thread* self) { bool explicit_overflow_check = Runtime::Current()->ExplicitStackOverflowChecks(); self->ResetDefaultStackEnd(!explicit_overflow_check); // Return to default stack size. + + // And restore protection if implicit checks are on. + if (!explicit_overflow_check) { + self->ProtectStack(); + } } void CheckReferenceResult(mirror::Object* o, Thread* self) { |