Revert of More simplification and unification of frame handling

src/crankshaft/lithium.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_CRANKSHAFT_LITHIUM_H_
 #define V8_CRANKSHAFT_LITHIUM_H_
 
 #include <set>
 
 #include "src/allocation.h"
@@ skipping 620 matching lines @@
  public:
   static LChunk* NewChunk(HGraph* graph);
 
   void AddInstruction(LInstruction* instruction, HBasicBlock* block);
   LConstantOperand* DefineConstantOperand(HConstant* constant);
   HConstant* LookupConstant(LConstantOperand* operand) const;
   Representation LookupLiteralRepresentation(LConstantOperand* operand) const;
 
   int ParameterAt(int index);
   int GetParameterStackSlot(int index) const;
-  bool HasAllocatedStackSlots() const {
-    return current_frame_slots_ != base_frame_slots_;
-  }
-  int GetSpillSlotCount() const {
-    return current_frame_slots_ - base_frame_slots_;
-  }
-  int GetTotalFrameSlotCount() const { return current_frame_slots_; }
+  int spill_slot_count() const { return spill_slot_count_; }
   CompilationInfo* info() const { return info_; }
   HGraph* graph() const { return graph_; }
   Isolate* isolate() const { return graph_->isolate(); }
   const ZoneList<LInstruction*>* instructions() const { return &instructions_; }
   void AddGapMove(int index, LOperand* from, LOperand* to);
   LGap* GetGapAt(int index) const;
   bool IsGapAt(int index) const;
   int NearestGapPos(int index) const;
   void MarkEmptyBlocks();
   const ZoneList<LPointerMap*>* pointer_maps() const { return &pointer_maps_; }
@@ skipping 28 matching lines @@
   Handle<Code> Codegen();
 
   void set_allocated_double_registers(BitVector* allocated_registers);
   BitVector* allocated_double_registers() {
     return allocated_double_registers_;
   }
 
  protected:
   LChunk(CompilationInfo* info, HGraph* graph);
 
-  int base_frame_slots_;
-  int current_frame_slots_;
+  int spill_slot_count_;
 
  private:
   void CommitDependencies(Handle<Code> code) const;
 
   CompilationInfo* info_;
   HGraph* const graph_;
   BitVector* allocated_double_registers_;
   ZoneList<LInstruction*> instructions_;
   ZoneList<LPointerMap*> pointer_maps_;
   ZoneList<Handle<SharedFunctionInfo>> inlined_functions_;
@@ skipping 49 matching lines @@
   LPlatformChunk* chunk_;
   CompilationInfo* info_;
   HGraph* const graph_;
   Status status_;
 
  private:
   Zone* zone_;
 };
 
 
+int StackSlotOffset(int index);
+
 enum NumberUntagDMode {
   NUMBER_CANDIDATE_IS_SMI,
   NUMBER_CANDIDATE_IS_ANY_TAGGED
 };
 
 
 class LPhase : public CompilationPhase {
  public:
   LPhase(const char* name, LChunk* chunk)
       : CompilationPhase(name, chunk->info()),
@@ skipping 59 matching lines @@
   InputIterator input_iterator_;
   DeepIterator env_iterator_;
 };
 
 class LInstruction;
 class LCodeGen;
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CRANKSHAFT_LITHIUM_H_