Index: src/x64/codegen-x64.cc |
=================================================================== |
--- src/x64/codegen-x64.cc (revision 3149) |
+++ src/x64/codegen-x64.cc (working copy) |
@@ -6771,7 +6771,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_scope) { |
// rax: result parameter for PerformGC, if any. |
@@ -6854,7 +6854,7 @@ |
__ j(zero, &failure_returned); |
// Exit the JavaScript to C++ exit frame. |
- __ LeaveExitFrame(frame_type, result_size_); |
+ __ LeaveExitFrame(mode, result_size_); |
__ ret(0); |
// Handling of failure. |
@@ -6984,12 +6984,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, result_size_); |
+ __ EnterExitFrame(mode, result_size_); |
// rax: Holds the context at this point, but should not be used. |
// On entry to code generated by GenerateCore, it must hold |
@@ -7012,7 +7012,7 @@ |
&throw_normal_exception, |
&throw_termination_exception, |
&throw_out_of_memory_exception, |
- frame_type, |
+ mode, |
false, |
false); |
@@ -7021,7 +7021,7 @@ |
&throw_normal_exception, |
&throw_termination_exception, |
&throw_out_of_memory_exception, |
- frame_type, |
+ mode, |
true, |
false); |
@@ -7032,7 +7032,7 @@ |
&throw_normal_exception, |
&throw_termination_exception, |
&throw_out_of_memory_exception, |
- frame_type, |
+ mode, |
true, |
true); |
@@ -7047,6 +7047,11 @@ |
} |
+void ApiGetterEntryStub::Generate(MacroAssembler* masm) { |
+ UNREACHABLE(); |
+} |
+ |
+ |
void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
Label invoke, exit; |
#ifdef ENABLE_LOGGING_AND_PROFILING |