A64: Synchronize with r16024.

src/frames.h

Index: src/frames.h
diff --git a/src/frames.h b/src/frames.h
index d2ebe917856125978e9f64d08ce4f7060c4ce801..ef514340cffcc32cbd128049825c26920f2189d7 100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -149,6 +149,7 @@ class StackHandler BASE_EMBEDDED {
 
   inline Object** context_address() const;
   inline Object** code_address() const;
+  inline void SetFp(Address slot, Address fp);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StackHandler);
 };
@@ -180,7 +181,7 @@ class StandardFrameConstants : public AllStatic {
   static const int kContextOffset     = -1 * kPointerSize;
   static const int kCallerFPOffset    =  0 * kPointerSize;
   static const int kCallerPCOffset    = +1 * kFPOnStackSize;
-  static const int kCallerSPOffset    = +2 * kPCOnStackSize;
+  static const int kCallerSPOffset    =  kCallerPCOffset + 1 * kPCOnStackSize;
 };