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

src/arm/frames-arm.cc

Index: src/arm/frames-arm.cc
===================================================================
--- src/arm/frames-arm.cc	(revision 5469)
+++ src/arm/frames-arm.cc	(working copy)
@@ -52,17 +52,8 @@
 }
 
 
-StackFrame::Type ExitFrame::GetStateForFramePointer(Address fp, State* state) {
-  if (fp == 0) return NONE;
-  // Compute frame type and stack pointer.
-  Address sp = fp + ExitFrameConstants::kSPOffset;
-
-  // Fill in the state.
-  state->sp = sp;
-  state->fp = fp;
-  state->pc_address = reinterpret_cast<Address*>(sp - 1 * kPointerSize);
-  ASSERT(*state->pc_address != NULL);
-  return EXIT;
+Address ExitFrame::ComputeStackPointer(Address fp) {
+  return fp + ExitFrameConstants::kSPOffset;
 }