| Index: src/x64/codegen-x64.cc
|
| diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
|
| index 0721ede00a7fb3e91aea25a3ef40409d8a07a8f5..46b2d8171d3576b078219071e5745fd3ba4da9c9 100644
|
| --- a/src/x64/codegen-x64.cc
|
| +++ b/src/x64/codegen-x64.cc
|
| @@ -6750,7 +6750,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_scope) {
|
| // rax: result parameter for PerformGC, if any.
|
| @@ -6833,7 +6833,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm,
|
| __ 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.
|
| @@ -6963,12 +6963,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, 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
|
| @@ -6991,7 +6991,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);
|
|
|
| @@ -7000,7 +7000,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);
|
|
|
| @@ -7011,7 +7011,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);
|
|
|
| @@ -7026,6 +7026,11 @@ void CEntryStub::GenerateBody(MacroAssembler* masm, bool is_debug_break) {
|
| }
|
|
|
|
|
| +void ApiGetterEntryStub::Generate(MacroAssembler* masm) {
|
| + UNREACHABLE();
|
| +}
|
| +
|
| +
|
| void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
|
| Label invoke, exit;
|
| #ifdef ENABLE_LOGGING_AND_PROFILING
|
|
|