Reviewers: Yang,
Description:
Simplify re-throwing in RegExpExecStub.
[email protected]
TEST=mjsunit/regexp-stack-overflow
Please review this at https://codereview.chromium.org/965423002/
Base URL: https://chromium.googlesource.com/v8/v8.git@local_trycatch-8
Affected files (+50, -49 lines):
M src/ia32/code-stubs-ia32.cc
Index: src/ia32/code-stubs-ia32.cc
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
index
262c9c135a448dc683235081963f272e5a9ad05a..ade6fd68865b991c9a07d45ad99c96fa5fbd30f7
100644
--- a/src/ia32/code-stubs-ia32.cc
+++ b/src/ia32/code-stubs-ia32.cc
@@ -1184,52 +1184,6 @@ void
RestParamAccessStub::GenerateNew(MacroAssembler* masm) {
}
-static void ThrowPendingException(MacroAssembler* masm) {
- Isolate* isolate = masm->isolate();
-
- ExternalReference pending_handler_context_address(
- Isolate::kPendingHandlerContextAddress, isolate);
- ExternalReference pending_handler_code_address(
- Isolate::kPendingHandlerCodeAddress, isolate);
- ExternalReference pending_handler_offset_address(
- Isolate::kPendingHandlerOffsetAddress, isolate);
- ExternalReference pending_handler_fp_address(
- Isolate::kPendingHandlerFPAddress, isolate);
- ExternalReference pending_handler_sp_address(
- Isolate::kPendingHandlerSPAddress, isolate);
-
- // Ask the runtime for help to determine the handler. This will set eax
to
- // contain the current pending exception, don't clobber it.
- ExternalReference find_handler(Runtime::kFindExceptionHandler, isolate);
- __ mov(Operand(esp, 0 * kPointerSize), Immediate(0)); // argc.
- __ mov(Operand(esp, 1 * kPointerSize), Immediate(0)); // argv.
- __ mov(Operand(esp, 2 * kPointerSize),
- Immediate(ExternalReference::isolate_address(isolate)));
- __ mov(ebx, Immediate(find_handler));
- __ call(ebx);
-
- // Retrieve the handler context, SP and FP.
- __ mov(esi, Operand::StaticVariable(pending_handler_context_address));
- __ mov(esp, Operand::StaticVariable(pending_handler_sp_address));
- __ mov(ebp, Operand::StaticVariable(pending_handler_fp_address));
-
- // If the handler is a JS frame, restore the context to the frame.
- // (kind == ENTRY) == (ebp == 0) == (esi == 0), so we could test either
- // ebp or esi.
- Label skip;
- __ test(esi, esi);
- __ j(zero, &skip, Label::kNear);
- __ mov(Operand(ebp, StandardFrameConstants::kContextOffset), esi);
- __ bind(&skip);
-
- // Compute the handler entry address and jump to it.
- __ mov(edi, Operand::StaticVariable(pending_handler_code_address));
- __ mov(edx, Operand::StaticVariable(pending_handler_offset_address));
- __ lea(edi, FieldOperand(edi, edx, times_1, Code::kHeaderSize));
- __ jmp(edi);
-}
-
-
void RegExpExecStub::Generate(MacroAssembler* masm) {
// Just jump directly to runtime if native RegExp is not selected at
compile
// time or if regexp entry in generated code is turned off runtime
switch or
@@ -1512,9 +1466,16 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
__ cmp(edx, eax);
__ j(equal, &runtime);
+ // Clear the pending exception variable.
+ __ mov(Operand::StaticVariable(pending_exception), edx);
+
// For exception, throw the exception again.
- __ EnterExitFrame(false);
- ThrowPendingException(masm);
+ {
+ FrameScope frame(masm, StackFrame::INTERNAL);
+ __ push(eax); // Exception.
+ __ CallRuntime(Runtime::kReThrow, 1);
+ __ int3(); // Unreachable.
+ }
__ bind(&failure);
// For failure to match, return null.
@@ -2571,7 +2532,47 @@ void CEntryStub::Generate(MacroAssembler* masm) {
// Handling of exception.
__ bind(&exception_returned);
- ThrowPendingException(masm);
+
+ ExternalReference pending_handler_context_address(
+ Isolate::kPendingHandlerContextAddress, isolate());
+ ExternalReference pending_handler_code_address(
+ Isolate::kPendingHandlerCodeAddress, isolate());
+ ExternalReference pending_handler_offset_address(
+ Isolate::kPendingHandlerOffsetAddress, isolate());
+ ExternalReference pending_handler_fp_address(
+ Isolate::kPendingHandlerFPAddress, isolate());
+ ExternalReference pending_handler_sp_address(
+ Isolate::kPendingHandlerSPAddress, isolate());
+
+ // Ask the runtime for help to determine the handler. This will set eax
to
+ // contain the current pending exception, don't clobber it.
+ ExternalReference find_handler(Runtime::kFindExceptionHandler,
isolate());
+ __ mov(Operand(esp, 0 * kPointerSize), Immediate(0)); // argc.
+ __ mov(Operand(esp, 1 * kPointerSize), Immediate(0)); // argv.
+ __ mov(Operand(esp, 2 * kPointerSize),
+ Immediate(ExternalReference::isolate_address(isolate())));
+ __ mov(ebx, Immediate(find_handler));
+ __ call(ebx);
+
+ // Retrieve the handler context, SP and FP.
+ __ mov(esi, Operand::StaticVariable(pending_handler_context_address));
+ __ mov(esp, Operand::StaticVariable(pending_handler_sp_address));
+ __ mov(ebp, Operand::StaticVariable(pending_handler_fp_address));
+
+ // If the handler is a JS frame, restore the context to the frame.
+ // (kind == ENTRY) == (ebp == 0) == (esi == 0), so we could test either
+ // ebp or esi.
+ Label skip;
+ __ test(esi, esi);
+ __ j(zero, &skip, Label::kNear);
+ __ mov(Operand(ebp, StandardFrameConstants::kContextOffset), esi);
+ __ bind(&skip);
+
+ // Compute the handler entry address and jump to it.
+ __ mov(edi, Operand::StaticVariable(pending_handler_code_address));
+ __ mov(edx, Operand::StaticVariable(pending_handler_offset_address));
+ __ lea(edi, FieldOperand(edi, edx, times_1, Code::kHeaderSize));
+ __ jmp(edi);
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
