Index: src/compiler/frame.cc |
diff --git a/src/compiler/frame.cc b/src/compiler/frame.cc |
index 7b9a797f5a4d45345233870f49a27c284569bfbf..64ef5ed102f5b7176eb1836d34cfed9685c4c1a5 100644 |
--- a/src/compiler/frame.cc |
+++ b/src/compiler/frame.cc |
@@ -12,14 +12,41 @@ namespace v8 { |
namespace internal { |
namespace compiler { |
-Frame::Frame(int fixed_frame_size_in_slots) |
- : frame_slot_count_(fixed_frame_size_in_slots), |
- outgoing_parameter_slot_count_(0), |
+Frame::Frame(int fixed_frame_size_in_slots, const CallDescriptor* descriptor) |
+ : needs_frame_((descriptor != nullptr) && |
+ descriptor->RequiresFrameAsIncoming()), |
+ frame_slot_count_(fixed_frame_size_in_slots), |
callee_saved_slot_count_(0), |
spill_slot_count_(0), |
allocated_registers_(NULL), |
allocated_double_registers_(NULL) {} |
+ |
+void FrameAccessState::SetFrameAccessToDefault() { |
+ if (frame()->needs_frame() && !FLAG_turbo_sp_frame_access) { |
+ SetFrameAccessToFP(); |
+ } else { |
+ SetFrameAccessToSP(); |
+ } |
+} |
+ |
+ |
+FrameOffset FrameAccessState::GetFrameOffset(int spill_slot) const { |
+ const int offset = |
+ (StandardFrameConstants::kFixedSlotCountAboveFp - spill_slot - 1) * |
+ kPointerSize; |
+ if (access_frame_with_fp()) { |
+ DCHECK(frame()->needs_frame()); |
+ return FrameOffset::FromFramePointer(offset); |
+ } else { |
+ // No frame. Retrieve all parameters relative to stack pointer. |
+ int sp_offset = |
+ offset + ((frame()->GetSpToFpSlotCount() + sp_delta()) * kPointerSize); |
+ return FrameOffset::FromStackPointer(sp_offset); |
+ } |
+} |
+ |
+ |
} // namespace compiler |
} // namespace internal |
} // namespace v8 |