Revert of More simplification and unification of frame handling

src/crankshaft/x64/lithium-codegen-x64.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_X64_LITHIUM_CODEGEN_X64_H_
 #define V8_CRANKSHAFT_X64_LITHIUM_CODEGEN_X64_H_
 
 
 #include "src/ast/scopes.h"
 #include "src/base/logging.h"
@@ skipping 27 matching lines @@
 
   int LookupDestination(int block_id) const {
     return chunk()->LookupDestination(block_id);
   }
 
   bool IsNextEmittedBlock(int block_id) const {
     return LookupDestination(block_id) == GetNextEmittedBlock();
   }
 
   bool NeedsEagerFrame() const {
-    return HasAllocatedStackSlots() || info()->is_non_deferred_calling() ||
-           !info()->IsStub() || info()->requires_frame();
+    return GetStackSlotCount() > 0 ||
+        info()->is_non_deferred_calling() ||
+        !info()->IsStub() ||
+        info()->requires_frame();
   }
   bool NeedsDeferredFrame() const {
     return !NeedsEagerFrame() && info()->is_deferred_calling();
   }
 
   // Support for converting LOperands to assembler types.
   Register ToRegister(LOperand* op) const;
   XMMRegister ToDoubleRegister(LOperand* op) const;
   bool IsInteger32Constant(LConstantOperand* op) const;
   bool IsExternalConstant(LConstantOperand* op) const;
@@ skipping 59 matching lines @@
 
   XMMRegister double_scratch0() const { return xmm0; }
 
   void EmitClassOfTest(Label* if_true,
                        Label* if_false,
                        Handle<String> class_name,
                        Register input,
                        Register temporary,
                        Register scratch);
 
-  bool HasAllocatedStackSlots() const {
-    return chunk()->HasAllocatedStackSlots();
-  }
-  int GetStackSlotCount() const { return chunk()->GetSpillSlotCount(); }
-  int GetTotalFrameSlotCount() const {
-    return chunk()->GetTotalFrameSlotCount();
-  }
+  int GetStackSlotCount() const { return chunk()->spill_slot_count(); }
 
   void AddDeferredCode(LDeferredCode* code) { deferred_.Add(code, zone()); }
 
 
   void SaveCallerDoubles();
   void RestoreCallerDoubles();
 
   // Code generation passes.  Returns true if code generation should
   // continue.
   void GenerateBodyInstructionPre(LInstruction* instr) override;
@@ skipping 232 matching lines @@
   Label exit_;
   Label done_;
   Label* external_exit_;
   int instruction_index_;
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CRANKSHAFT_X64_LITHIUM_CODEGEN_X64_H_