| Index: src/x64/lithium-codegen-x64.h
|
| diff --git a/src/x64/lithium-codegen-x64.h b/src/x64/lithium-codegen-x64.h
|
| index 2fa10e151766dc7d7bbc896bd11f0769b8dfc5af..e068f14b5ad94c833b5b17a3019a00846ada9e14 100644
|
| --- a/src/x64/lithium-codegen-x64.h
|
| +++ b/src/x64/lithium-codegen-x64.h
|
| @@ -63,7 +63,6 @@ class LCodeGen BASE_EMBEDDED {
|
| deferred_(8, info->zone()),
|
| osr_pc_offset_(-1),
|
| last_lazy_deopt_pc_(0),
|
| - frame_is_built_(false),
|
| safepoints_(info->zone()),
|
| resolver_(this),
|
| expected_safepoint_kind_(Safepoint::kSimple) {
|
| @@ -78,15 +77,6 @@ class LCodeGen BASE_EMBEDDED {
|
| Heap* heap() const { return isolate()->heap(); }
|
| Zone* zone() const { return zone_; }
|
|
|
| - bool NeedsEagerFrame() const {
|
| - return GetStackSlotCount() > 0 ||
|
| - info()->is_non_deferred_calling() ||
|
| - !info()->IsStub();
|
| - }
|
| - 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;
|
| @@ -120,7 +110,7 @@ class LCodeGen BASE_EMBEDDED {
|
| Label* map_check);
|
|
|
| void DoCheckMapCommon(Register reg, Handle<Map> map,
|
| - CompareMapMode mode, LInstruction* instr);
|
| + CompareMapMode mode, LEnvironment* env);
|
|
|
| // Parallel move support.
|
| void DoParallelMove(LParallelMove* move);
|
| @@ -168,7 +158,7 @@ class LCodeGen BASE_EMBEDDED {
|
| Register scratch);
|
|
|
| int GetStackSlotCount() const { return chunk()->spill_slot_count(); }
|
| - int GetParameterCount() const { return info()->num_parameters(); }
|
| + int GetParameterCount() const { return scope()->num_parameters(); }
|
|
|
| void Abort(const char* reason);
|
| void Comment(const char* format, ...);
|
| @@ -337,15 +327,11 @@ class LCodeGen BASE_EMBEDDED {
|
| int* offset);
|
|
|
| struct JumpTableEntry {
|
| - inline JumpTableEntry(Address entry, bool frame, bool is_lazy)
|
| + explicit inline JumpTableEntry(Address entry)
|
| : label(),
|
| - address(entry),
|
| - needs_frame(frame),
|
| - is_lazy_deopt(is_lazy) { }
|
| + address(entry) { }
|
| Label label;
|
| Address address;
|
| - bool needs_frame;
|
| - bool is_lazy_deopt;
|
| };
|
|
|
| void EnsureSpaceForLazyDeopt(int space_needed);
|
| @@ -374,7 +360,6 @@ class LCodeGen BASE_EMBEDDED {
|
| ZoneList<LDeferredCode*> deferred_;
|
| int osr_pc_offset_;
|
| int last_lazy_deopt_pc_;
|
| - bool frame_is_built_;
|
|
|
| // Builder that keeps track of safepoints in the code. The table
|
| // itself is emitted at the end of the generated code.
|
| @@ -389,7 +374,6 @@ class LCodeGen BASE_EMBEDDED {
|
| public:
|
| explicit PushSafepointRegistersScope(LCodeGen* codegen)
|
| : codegen_(codegen) {
|
| - ASSERT(codegen_->info()->is_calling());
|
| ASSERT(codegen_->expected_safepoint_kind_ == Safepoint::kSimple);
|
| codegen_->masm_->PushSafepointRegisters();
|
| codegen_->expected_safepoint_kind_ = Safepoint::kWithRegisters;
|
|
|