| Index: src/arm/lithium-codegen-arm.h
|
| diff --git a/src/arm/lithium-codegen-arm.h b/src/arm/lithium-codegen-arm.h
|
| index f35c69b8a30b6828ba742feb7ba4d946e41eda42..880d22523ec560623997a6a7868425f4e8c51a1f 100644
|
| --- a/src/arm/lithium-codegen-arm.h
|
| +++ b/src/arm/lithium-codegen-arm.h
|
| @@ -43,26 +43,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),
|
| - deopt_jump_table_(4, zone),
|
| - deoptimization_literals_(8, zone),
|
| + deoptimizations_(4, info->zone()),
|
| + deopt_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();
|
| @@ -350,6 +349,7 @@ class LCodeGen BASE_EMBEDDED {
|
|
|
| void EnsureSpaceForLazyDeopt();
|
|
|
| + Zone* zone_;
|
| LChunk* const chunk_;
|
| MacroAssembler* const masm_;
|
| CompilationInfo* const info_;
|
| @@ -372,8 +372,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_;
|
|
|
|
|