diff options
| author | 2013-11-25 14:32:51 -0800 | |
|---|---|---|
| committer | 2013-11-25 14:32:51 -0800 | |
| commit | 26c6dce526a90a7345600f5f82050a42740d12f8 (patch) | |
| tree | 895d3f03073fca0ca6715bcb523816fa6f03cc0a /compiler/dex/quick/codegen_util.cc | |
| parent | 2044b133f4ce20e4697cee8ecfaac93ff4ac4744 (diff) | |
| parent | 7410f29b4dae223befac036ea567d7f33351dad1 (diff) | |
Merge branch 'dalvik-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/art into merge-goog-dalvik-dev-to-aosp-master
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index dfbc887299..4bc0b357af 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -920,7 +920,8 @@ Mir2Lir::Mir2Lir(CompilationUnit* cu, MIRGraph* mir_graph, ArenaAllocator* arena core_spill_mask_(0), fp_spill_mask_(0), first_lir_insn_(NULL), - last_lir_insn_(NULL) { + last_lir_insn_(NULL), + inliner_(nullptr) { promotion_map_ = static_cast<PromotionMap*> (arena_->Alloc((cu_->num_dalvik_registers + cu_->num_compiler_temps + 1) * sizeof(promotion_map_[0]), ArenaAllocator::kAllocRegAlloc)); |