A64: Synchronize with r15545.

src/frames.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 17 matching lines @@
 #ifndef V8_FRAMES_H_
 #define V8_FRAMES_H_
 
 #include "allocation.h"
 #include "handles.h"
 #include "safepoint-table.h"
 
 namespace v8 {
 namespace internal {
 
-#if defined(V8_TARGET_ARCH_A64)
+#if V8_TARGET_ARCH_A64
 typedef uint64_t RegList;
 #else
 typedef uint32_t RegList;
 #endif
 
 // Get the number of registers in a given register list.
 int NumRegs(RegList list);
 
 void SetUpJSCallerSavedCodeData();
 
@@ skipping 245 matching lines @@
 
   virtual void Iterate(ObjectVisitor* v) const = 0;
   static void IteratePc(ObjectVisitor* v, Address* pc_address, Code* holder);
 
   // Sets a callback function for return-address rewriting profilers
   // to resolve the location of a return address to the location of the
   // profiler's stashed return address.
   static void SetReturnAddressLocationResolver(
       ReturnAddressLocationResolver resolver);
 
+  // Resolves pc_address through the resolution address function if one is set.
+  static inline Address* ResolveReturnAddressLocation(Address* pc_address);
+
+
   // Printing support.
   enum PrintMode { OVERVIEW, DETAILS };
   virtual void Print(StringStream* accumulator,
                      PrintMode mode,
                      int index) const { }
 
   Isolate* isolate() const { return isolate_; }
 
  protected:
   inline explicit StackFrame(StackFrameIteratorBase* iterator);
@@ skipping 15 matching lines @@
 
 #ifdef DEBUG
   bool can_access_heap_objects() const;
 #endif
 
  private:
   const StackFrameIteratorBase* iterator_;
   Isolate* isolate_;
   State state_;
 
+  static ReturnAddressLocationResolver return_address_location_resolver_;
+
   // Fill in the state of the calling frame.
   virtual void ComputeCallerState(State* state) const = 0;
 
   // Get the type and the state of the calling frame.
   virtual Type GetCallerState(State* state) const;
 
   static const intptr_t kIsolateTag = 1;
 
   friend class StackFrameIterator;
   friend class StackFrameIteratorBase;
@@ skipping 523 matching lines @@
 
  private:
   bool IsValidFrame();
 };
 
 
 class SafeStackFrameIterator: public StackFrameIteratorBase {
  public:
   SafeStackFrameIterator(Isolate* isolate,
                          Address fp, Address sp,
-                         Address low_bound, Address high_bound);
+                         Address js_entry_sp);
 
   inline JavaScriptFrame* frame() const;
   void Advance();
 
+  StackFrame::Type top_frame_type() const { return top_frame_type_; }
+
  private:
   void AdvanceOneFrame();
 
   bool IsValidStackAddress(Address addr) const {
     return low_bound_ <= addr && addr <= high_bound_;
   }
   bool IsValidFrame(StackFrame* frame) const;
   bool IsValidCaller(StackFrame* frame);
   bool IsValidExitFrame(Address fp) const;
   bool IsValidTop(ThreadLocalTop* top) const;
 
   const Address low_bound_;
   const Address high_bound_;
+  StackFrame::Type top_frame_type_;
 };
 
 
 class StackFrameLocator BASE_EMBEDDED {
  public:
   explicit StackFrameLocator(Isolate* isolate) : iterator_(isolate) {}
 
   // Find the nth JavaScript frame on the stack. The caller must
   // guarantee that such a frame exists.
   JavaScriptFrame* FindJavaScriptFrame(int n);
 
  private:
   StackFrameIterator iterator_;
 };
 
 
 // Reads all frames on the current stack and copies them into the current
 // zone memory.
 Vector<StackFrame*> CreateStackMap(Isolate* isolate, Zone* zone);
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAMES_H_