| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index f6d99060b4f6025d37eba7a7fa0263d1dab569e2..2b9d846fdf209b672f7f57413bf538449ba1c2dc 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -4292,6 +4292,34 @@ void FullCodeGenerator::ExitFinallyBlock() {
|
|
|
| #undef __
|
|
|
| +#define __ ACCESS_MASM(masm())
|
| +
|
| +FullCodeGenerator::NestedStatement* FullCodeGenerator::TryFinally::Exit(
|
| + int* stack_depth,
|
| + int* context_length) {
|
| + // The macros used here must preserve the result register.
|
| +
|
| + // Because the handler block contains the context of the finally
|
| + // code, we can restore it directly from there for the finally code
|
| + // rather than iteratively unwinding contexts via their previous
|
| + // links.
|
| + __ Drop(*stack_depth); // Down to the handler block.
|
| + if (*context_length > 0) {
|
| + // Restore the context to its dedicated register and the stack.
|
| + __ ldr(cp, MemOperand(sp, StackHandlerConstants::kContextOffset));
|
| + __ str(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| + }
|
| + __ PopTryHandler();
|
| + __ bl(finally_entry_);
|
| +
|
| + *stack_depth = 0;
|
| + *context_length = 0;
|
| + return previous_;
|
| +}
|
| +
|
| +
|
| +#undef __
|
| +
|
| } } // namespace v8::internal
|
|
|
| #endif // V8_TARGET_ARCH_ARM
|
|
|