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

src/frames.cc

Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index 5ee5b5615db7ceb2650c5e41f17b8369db71a3a1..a7bd91a79636a2bb601d0bdade272e10a3467609 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -325,7 +325,7 @@
       external_callback_scope_ = external_callback_scope_->previous();
     }
     if (frame_->is_java_script()) break;
-    if (frame_->is_exit() || frame_->is_builtin_exit()) {
+    if (frame_->is_exit()) {
       // Some of the EXIT frames may have ExternalCallbackScope allocated on
       // top of them. In that case the scope corresponds to the first EXIT
       // frame beneath it. There may be other EXIT frames on top of the
@@ -485,7 +485,6 @@
     case ENTRY:
     case ENTRY_CONSTRUCT:
     case EXIT:
-    case BUILTIN_EXIT:
     case STUB:
     case STUB_FAILURE_TRAMPOLINE:
     case INTERNAL:
@@ -559,6 +558,7 @@
   return Memory::Object_at(fp() + offset);
 }
 
+
 Code* ExitFrame::unchecked_code() const {
   return reinterpret_cast<Code*>(code_slot());
 }
@@ -600,26 +600,6 @@
   Address sp = ComputeStackPointer(fp);
   FillState(fp, sp, state);
   DCHECK(*state->pc_address != NULL);
-
-  return ComputeFrameType(fp);
-}
-
-StackFrame::Type ExitFrame::ComputeFrameType(Address fp) {
-  // Distinguish between between regular and builtin exit frames.
-  // Default to EXIT in all hairy cases (e.g., when called from profiler).
-  const int offset = ExitFrameConstants::kFrameTypeOffset;
-  Object* marker = Memory::Object_at(fp + offset);
-
-  if (!marker->IsSmi()) {
-    return EXIT;
-  }
-
-  StackFrame::Type frame_type =
-      static_cast<StackFrame::Type>(Smi::cast(marker)->value());
-  if (frame_type == EXIT || frame_type == BUILTIN_EXIT) {
-    return frame_type;
-  }
-
   return EXIT;
 }
 
@@ -638,10 +618,6 @@
   // stub).  ComputeCallerState will retrieve the constant pool
   // together with the associated caller pc.
   state->constant_pool_address = NULL;
-}
-
-JSFunction* BuiltinExitFrame::function() const {
-  return JSFunction::cast(function_slot_object());
 }
 
 Address StandardFrame::GetExpressionAddress(int n) const {
@@ -702,7 +678,6 @@
       case ENTRY:
       case ENTRY_CONSTRUCT:
       case EXIT:
-      case BUILTIN_EXIT:
       case STUB_FAILURE_TRAMPOLINE:
       case ARGUMENTS_ADAPTOR:
       case STUB: