diff options
Diffstat (limited to 'runtime/common_throws.cc')
| -rw-r--r-- | runtime/common_throws.cc | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/runtime/common_throws.cc b/runtime/common_throws.cc index ec43f69b19..e1cabbb574 100644 --- a/runtime/common_throws.cc +++ b/runtime/common_throws.cc @@ -696,13 +696,23 @@ void ThrowSecurityException(const char* fmt, ...) { // Stack overflow. +template <StackType stack_type> void ThrowStackOverflowError(Thread* self) { - if (self->IsHandlingStackOverflow()) { + if (self->IsHandlingStackOverflow<stack_type>()) { LOG(ERROR) << "Recursive stack overflow."; // We don't fail here because SetStackEndForStackOverflow will print better diagnostics. } - self->SetStackEndForStackOverflow(); // Allow space on the stack for constructor to execute. + // Allow space on the stack for constructor to execute. + self->SetStackEndForStackOverflow<stack_type>(); + + // Remove the stack overflow protection if it is set up. + bool implicit_stack_check = Runtime::Current()->GetImplicitStackOverflowChecks(); + if (implicit_stack_check) { + if (!self->UnprotectStack<stack_type>()) { + LOG(ERROR) << "Unable to remove stack protection for stack overflow"; + } + } // Avoid running Java code for exception initialization. // TODO: Checks to make this a bit less brittle. @@ -713,7 +723,7 @@ void ThrowStackOverflowError(Thread* self) { // with larger stack sizes (e.g., ASAN). auto create_and_throw = [self]() REQUIRES_SHARED(Locks::mutator_lock_) NO_INLINE { std::string msg("stack size "); - msg += PrettySize(self->GetStackSize()); + msg += PrettySize(self->GetUsableStackSize<stack_type>()); ScopedObjectAccessUnchecked soa(self); StackHandleScope<1u> hs(self); @@ -791,14 +801,17 @@ void ThrowStackOverflowError(Thread* self) { create_and_throw(); CHECK(self->IsExceptionPending()); - self->ResetDefaultStackEnd(); // Return to default stack size. + self->ResetDefaultStackEnd<stack_type>(); // Return to default stack size. // And restore protection if implicit checks are on. - if (Runtime::Current()->GetImplicitStackOverflowChecks()) { - self->ProtectStack(); + if (implicit_stack_check) { + self->ProtectStack<stack_type>(); } } +// Explicit instantiations to keep this definition separate to the declaration. +template void ThrowStackOverflowError<StackType::kHardware>(Thread* self); + // StringIndexOutOfBoundsException void ThrowStringIndexOutOfBoundsException(int index, int length) { |