Revert of [builtins] New frame type for exits to C++ builtins

src/x64/macro-assembler-x64.cc

Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index 573e75db636340aee6cbea7e5b6fe27c7ea5b5c9..888dbbec481db90662cde0e18cb5fd97fae0fd76 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -738,14 +738,14 @@
   JumpToExternalReference(ExternalReference(fid, isolate()));
 }
 
-void MacroAssembler::JumpToExternalReference(const ExternalReference& ext,
-                                             bool builtin_exit_frame) {
+
+void MacroAssembler::JumpToExternalReference(const ExternalReference& ext) {
   // Set the entry point and jump to the C entry runtime stub.
   LoadAddress(rbx, ext);
-  CEntryStub ces(isolate(), 1, kDontSaveFPRegs, kArgvOnStack,
-                 builtin_exit_frame);
+  CEntryStub ces(isolate(), 1);
   jmp(ces.GetCode(), RelocInfo::CODE_TARGET);
 }
+
 
 #define REG(Name) \
   { Register::kCode_##Name }
@@ -4436,11 +4436,8 @@
   popq(rbp);
 }
 
-void MacroAssembler::EnterExitFramePrologue(bool save_rax,
-                                            StackFrame::Type frame_type) {
-  DCHECK(frame_type == StackFrame::EXIT ||
-         frame_type == StackFrame::BUILTIN_EXIT);
-
+
+void MacroAssembler::EnterExitFramePrologue(bool save_rax) {
   // Set up the frame structure on the stack.
   // All constants are relative to the frame pointer of the exit frame.
   DCHECK_EQ(kFPOnStackSize + kPCOnStackSize,
@@ -4451,7 +4448,7 @@
   movp(rbp, rsp);
 
   // Reserve room for entry stack pointer and push the code object.
-  Push(Smi::FromInt(frame_type));
+  Push(Smi::FromInt(StackFrame::EXIT));
   DCHECK_EQ(-2 * kPointerSize, ExitFrameConstants::kSPOffset);
   Push(Immediate(0));  // Saved entry sp, patched before call.
   Move(kScratchRegister, CodeObject(), RelocInfo::EMBEDDED_OBJECT);
@@ -4502,9 +4499,9 @@
   movp(Operand(rbp, ExitFrameConstants::kSPOffset), rsp);
 }
 
-void MacroAssembler::EnterExitFrame(int arg_stack_space, bool save_doubles,
-                                    StackFrame::Type frame_type) {
-  EnterExitFramePrologue(true, frame_type);
+
+void MacroAssembler::EnterExitFrame(int arg_stack_space, bool save_doubles) {
+  EnterExitFramePrologue(true);
 
   // Set up argv in callee-saved register r15. It is reused in LeaveExitFrame,
   // so it must be retained across the C-call.
@@ -4516,7 +4513,7 @@
 
 
 void MacroAssembler::EnterApiExitFrame(int arg_stack_space) {
-  EnterExitFramePrologue(false, StackFrame::EXIT);
+  EnterExitFramePrologue(false);
   EnterExitFrameEpilogue(arg_stack_space, false);
 }