Index: src/arm64/code-stubs-arm64.cc |
diff --git a/src/arm64/code-stubs-arm64.cc b/src/arm64/code-stubs-arm64.cc |
index b5eef87f818b82e2692b0231a79bd94a3a974565..88a40ee170d1b054ba5814a0809bab3efead0b4c 100644 |
--- a/src/arm64/code-stubs-arm64.cc |
+++ b/src/arm64/code-stubs-arm64.cc |
@@ -1256,7 +1256,7 @@ void CEntryStub::Generate(MacroAssembler* masm) { |
// x4: argv. |
// Output: |
// x0: result. |
-void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
+void JSEntryStub::Generate(MacroAssembler* masm) { |
DCHECK(jssp.Is(__ StackPointer())); |
Register code_entry = x0; |
@@ -1287,7 +1287,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
__ Fmov(fp_zero, 0.0); |
// Build an entry frame (see layout below). |
- int marker = is_construct ? StackFrame::ENTRY_CONSTRUCT : StackFrame::ENTRY; |
+ int marker = type(); |
int64_t bad_frame_pointer = -1L; // Bad frame pointer to fail if it is used. |
__ Mov(x13, bad_frame_pointer); |
__ Mov(x12, Smi::FromInt(marker)); |
@@ -1372,8 +1372,9 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// x2: receiver. |
// x3: argc. |
// x4: argv. |
- ExternalReference entry(is_construct ? Builtins::kJSConstructEntryTrampoline |
- : Builtins::kJSEntryTrampoline, |
+ ExternalReference entry(type() == StackFrame::ENTRY_CONSTRUCT |
+ ? Builtins::kJSConstructEntryTrampoline |
+ : Builtins::kJSEntryTrampoline, |
isolate()); |
__ Mov(x10, entry); |