Index: src/arm/codegen-arm.cc |
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc |
index 79f401781c6f89878325e626a81317ba83411f65..811d3095589428f07fa9444b2ced781a8dc1d942 100644 |
--- a/src/arm/codegen-arm.cc |
+++ b/src/arm/codegen-arm.cc |
@@ -5774,7 +5774,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm, |
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 |
@@ -5834,7 +5834,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm, |
// r0:r1: result |
// sp: stack pointer |
// fp: frame pointer |
- __ LeaveExitFrame(frame_type); |
+ __ LeaveExitFrame(mode); |
// check if we should retry or throw exception |
Label retry; |
@@ -5880,12 +5880,12 @@ void CEntryStub::GenerateBody(MacroAssembler* masm, bool is_debug_break) { |
// 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) |
@@ -5900,7 +5900,7 @@ void CEntryStub::GenerateBody(MacroAssembler* masm, bool is_debug_break) { |
&throw_normal_exception, |
&throw_termination_exception, |
&throw_out_of_memory_exception, |
- frame_type, |
+ mode, |
false, |
false); |
@@ -5909,7 +5909,7 @@ void CEntryStub::GenerateBody(MacroAssembler* masm, bool is_debug_break) { |
&throw_normal_exception, |
&throw_termination_exception, |
&throw_out_of_memory_exception, |
- frame_type, |
+ mode, |
true, |
false); |
@@ -5920,7 +5920,7 @@ void CEntryStub::GenerateBody(MacroAssembler* masm, bool is_debug_break) { |
&throw_normal_exception, |
&throw_termination_exception, |
&throw_out_of_memory_exception, |
- frame_type, |
+ mode, |
true, |
true); |