| Index: src/arm/codegen-arm.cc
|
| ===================================================================
|
| --- src/arm/codegen-arm.cc (revision 3149)
|
| +++ src/arm/codegen-arm.cc (working copy)
|
| @@ -5795,7 +5795,7 @@
|
| Label* throw_normal_exception,
|
| Label* throw_termination_exception,
|
| Label* throw_out_of_memory_exception,
|
| - StackFrame::Type frame_type,
|
| + ExitFrame::Mode mode,
|
| bool do_gc,
|
| bool always_allocate) {
|
| // r0: result parameter for PerformGC, if any
|
| @@ -5855,7 +5855,7 @@
|
| // r0:r1: result
|
| // sp: stack pointer
|
| // fp: frame pointer
|
| - __ LeaveExitFrame(frame_type);
|
| + __ LeaveExitFrame(mode);
|
|
|
| // check if we should retry or throw exception
|
| Label retry;
|
| @@ -5901,12 +5901,12 @@
|
| // this by performing a garbage collection and retrying the
|
| // builtin once.
|
|
|
| - StackFrame::Type frame_type = is_debug_break
|
| - ? StackFrame::EXIT_DEBUG
|
| - : StackFrame::EXIT;
|
| + ExitFrame::Mode mode = is_debug_break
|
| + ? ExitFrame::MODE_DEBUG
|
| + : ExitFrame::MODE_NORMAL;
|
|
|
| // Enter the exit frame that transitions from JavaScript to C++.
|
| - __ EnterExitFrame(frame_type);
|
| + __ EnterExitFrame(mode);
|
|
|
| // r4: number of arguments (C callee-saved)
|
| // r5: pointer to builtin function (C callee-saved)
|
| @@ -5921,7 +5921,7 @@
|
| &throw_normal_exception,
|
| &throw_termination_exception,
|
| &throw_out_of_memory_exception,
|
| - frame_type,
|
| + mode,
|
| false,
|
| false);
|
|
|
| @@ -5930,7 +5930,7 @@
|
| &throw_normal_exception,
|
| &throw_termination_exception,
|
| &throw_out_of_memory_exception,
|
| - frame_type,
|
| + mode,
|
| true,
|
| false);
|
|
|
| @@ -5941,7 +5941,7 @@
|
| &throw_normal_exception,
|
| &throw_termination_exception,
|
| &throw_out_of_memory_exception,
|
| - frame_type,
|
| + mode,
|
| true,
|
| true);
|
|
|
|
|