| Index: src/x64/lithium-codegen-x64.h
|
| diff --git a/src/x64/lithium-codegen-x64.h b/src/x64/lithium-codegen-x64.h
|
| index 99e7ec82497fa76353ad2bc5b66bf7b8b48d2323..d7fe26b3aa4818629e930f4fcd281b9b47b6618a 100644
|
| --- a/src/x64/lithium-codegen-x64.h
|
| +++ b/src/x64/lithium-codegen-x64.h
|
| @@ -45,26 +45,25 @@ class SafepointGenerator;
|
|
|
| class LCodeGen BASE_EMBEDDED {
|
| public:
|
| - LCodeGen(LChunk* chunk, MacroAssembler* assembler, CompilationInfo* info,
|
| - Zone* zone)
|
| - : chunk_(chunk),
|
| + LCodeGen(LChunk* chunk, MacroAssembler* assembler, CompilationInfo* info)
|
| + : zone_(info->zone()),
|
| + chunk_(chunk),
|
| masm_(assembler),
|
| info_(info),
|
| current_block_(-1),
|
| current_instruction_(-1),
|
| instructions_(chunk->instructions()),
|
| - deoptimizations_(4, zone),
|
| - jump_table_(4, zone),
|
| - deoptimization_literals_(8, zone),
|
| + deoptimizations_(4, info->zone()),
|
| + jump_table_(4, info->zone()),
|
| + deoptimization_literals_(8, info->zone()),
|
| inlined_function_count_(0),
|
| scope_(info->scope()),
|
| status_(UNUSED),
|
| - translations_(zone),
|
| - deferred_(8, zone),
|
| + translations_(info->zone()),
|
| + deferred_(8, info->zone()),
|
| osr_pc_offset_(-1),
|
| last_lazy_deopt_pc_(0),
|
| - safepoints_(zone),
|
| - zone_(zone),
|
| + safepoints_(info->zone()),
|
| resolver_(this),
|
| expected_safepoint_kind_(Safepoint::kSimple) {
|
| PopulateDeoptimizationLiteralsWithInlinedFunctions();
|
| @@ -325,6 +324,7 @@ class LCodeGen BASE_EMBEDDED {
|
|
|
| void EnsureSpaceForLazyDeopt(int space_needed);
|
|
|
| + Zone* zone_;
|
| LChunk* const chunk_;
|
| MacroAssembler* const masm_;
|
| CompilationInfo* const info_;
|
| @@ -347,8 +347,6 @@ class LCodeGen BASE_EMBEDDED {
|
| // itself is emitted at the end of the generated code.
|
| SafepointTableBuilder safepoints_;
|
|
|
| - Zone* zone_;
|
| -
|
| // Compiler from a set of parallel moves to a sequential list of moves.
|
| LGapResolver resolver_;
|
|
|
|
|