diff options
| author | Dave Allison <dallison@google.com> | 2014-04-01 01:07:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-01 01:07:45 +0000 |
| commit | 81ed34e686532cebc1e17a273110decf0dd24e81 (patch) | |
| tree | 885a781e5f8bd852e2c1615108ae7b17576a6567 /runtime/entrypoints/entrypoint_utils.cc | |
| parent | cfd5acf281b0c509f86b13d73c6a8dfa3ea9922c (diff) | |
| parent | f943914730db8ad2ff03d49a2cacd31885d08fd7 (diff) | |
| download | art-81ed34e686532cebc1e17a273110decf0dd24e81.tar.gz art-81ed34e686532cebc1e17a273110decf0dd24e81.tar.bz2 art-81ed34e686532cebc1e17a273110decf0dd24e81.zip | |
Merge "Implement implicit stack overflow checks"
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 9e5f54ca20..c81706fcb2 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -134,7 +134,9 @@ void ThrowStackOverflowError(Thread* self) { LOG(ERROR) << "Couldn't throw new StackOverflowError because JNI ThrowNew failed."; CHECK(self->IsExceptionPending()); } - self->ResetDefaultStackEnd(); // Return to default stack size. + + bool explicit_overflow_check = Runtime::Current()->ExplicitStackOverflowChecks(); + self->ResetDefaultStackEnd(!explicit_overflow_check); // Return to default stack size. } JValue InvokeProxyInvocationHandler(ScopedObjectAccessUnchecked& soa, const char* shorty, |