Revert of More simplification and unification of frame handling

src/crankshaft/mips/lithium-mips.cc

Index: src/crankshaft/mips/lithium-mips.cc
diff --git a/src/crankshaft/mips/lithium-mips.cc b/src/crankshaft/mips/lithium-mips.cc
index fc55bdcafc7680ff22f217173731af45702f2022..027021177daa7ab4080926607157fc578eb37045 100644
--- a/src/crankshaft/mips/lithium-mips.cc
+++ b/src/crankshaft/mips/lithium-mips.cc
@@ -390,8 +390,8 @@
 
 int LPlatformChunk::GetNextSpillIndex(RegisterKind kind) {
   // Skip a slot if for a double-width slot.
-  if (kind == DOUBLE_REGISTERS) current_frame_slots_++;
-  return current_frame_slots_++;
+  if (kind == DOUBLE_REGISTERS) spill_slot_count_++;
+  return spill_slot_count_++;
 }
 
 
@@ -2403,7 +2403,6 @@
       Retry(kTooManySpillSlotsNeededForOSR);
       spill_index = 0;
     }
-    spill_index += StandardFrameConstants::kFixedSlotCount;
   }
   return DefineAsSpilled(new(zone()) LUnknownOSRValue, spill_index);
 }