Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/crankshaft/lithium.cc b/src/crankshaft/lithium.cc
index 82ad696..6776390 100644
--- a/src/crankshaft/lithium.cc
+++ b/src/crankshaft/lithium.cc
@@ -246,22 +246,9 @@
stream->Add("}");
}
-
-int StackSlotOffset(int index) {
- if (index >= 0) {
- // Local or spill slot. Skip the frame pointer, function, and
- // context in the fixed part of the frame.
- return -(index + 1) * kPointerSize -
- StandardFrameConstants::kFixedFrameSizeFromFp;
- } else {
- // Incoming parameter. Skip the return address.
- return -(index + 1) * kPointerSize + kFPOnStackSize + kPCOnStackSize;
- }
-}
-
-
LChunk::LChunk(CompilationInfo* info, HGraph* graph)
- : spill_slot_count_(0),
+ : base_frame_slots_(StandardFrameConstants::kFixedFrameSize / kPointerSize),
+ current_frame_slots_(base_frame_slots_),
info_(info),
graph_(graph),
instructions_(32, info->zone()),
@@ -270,7 +257,6 @@
deprecation_dependencies_(32, info->zone()),
stability_dependencies_(8, info->zone()) {}
-
LLabel* LChunk::GetLabel(int block_id) const {
HBasicBlock* block = graph_->blocks()->at(block_id);
int first_instruction = block->first_instruction_index();
@@ -495,9 +481,9 @@
while (!iterator.Done()) {
if (info()->saves_caller_doubles()) {
if (kDoubleSize == kPointerSize * 2) {
- spill_slot_count_ += 2;
+ current_frame_slots_ += 2;
} else {
- spill_slot_count_++;
+ current_frame_slots_++;
}
}
iterator.Advance();