Merge r5467..r5469 into branches/2.3....

src/x64/frames-x64.cc

Index: src/x64/frames-x64.cc
===================================================================
--- src/x64/frames-x64.cc	(revision 5469)
+++ src/x64/frames-x64.cc	(working copy)
@@ -50,18 +50,11 @@
 }
 
 
-StackFrame::Type ExitFrame::GetStateForFramePointer(Address fp, State* state) {
-  if (fp == 0) return NONE;
-  // Compute the stack pointer.
-  Address sp = Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
-  // Fill in the state.
-  state->fp = fp;
-  state->sp = sp;
-  state->pc_address = reinterpret_cast<Address*>(sp - 1 * kPointerSize);
-  ASSERT(*state->pc_address != NULL);
-  return EXIT;
+Address ExitFrame::ComputeStackPointer(Address fp) {
+  return Memory::Address_at(fp + ExitFrameConstants::kSPOffset);
 }
 
+
 int JavaScriptFrame::GetProvidedParametersCount() const {
   return ComputeParametersCount();
 }