A64: Synchronize with r15545.

src/frames-inl.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 120 matching lines @@
 inline Code* StackFrame::LookupCode() const {
   return GetContainingCode(isolate(), pc());
 }
 
 
 inline Code* StackFrame::GetContainingCode(Isolate* isolate, Address pc) {
   return isolate->inner_pointer_to_code_cache()->GetCacheEntry(pc)->code;
 }
 
 
+inline Address* StackFrame::ResolveReturnAddressLocation(Address* pc_address) {
+  if (return_address_location_resolver_ == NULL) {
+    return pc_address;
+  } else {
+    return reinterpret_cast<Address*>(
+        return_address_location_resolver_(
+            reinterpret_cast<uintptr_t>(pc_address)));
+  }
+}
+
+
 inline EntryFrame::EntryFrame(StackFrameIteratorBase* iterator)
     : StackFrame(iterator) {
 }
 
 
 inline EntryConstructFrame::EntryConstructFrame(
     StackFrameIteratorBase* iterator)
     : EntryFrame(iterator) {
 }
 
@@ skipping 179 matching lines @@
 inline JavaScriptFrame* SafeStackFrameIterator::frame() const {
   ASSERT(!done());
   ASSERT(frame_->is_java_script());
   return static_cast<JavaScriptFrame*>(frame_);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAMES_INL_H_