diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-17 17:09:30 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-17 18:10:19 +0000 |
| commit | 216eaa2927f424821a03d7c4c6bf701fdb48e865 (patch) | |
| tree | 0c4d0e5302723c4955eb22f260af8500c31768d2 /compiler/dex/mir_graph.cc | |
| parent | a67f4b37b216d3bf84d3e204a0d71d8d4660fab4 (diff) | |
| download | art-216eaa2927f424821a03d7c4c6bf701fdb48e865.tar.gz art-216eaa2927f424821a03d7c4c6bf701fdb48e865.tar.bz2 art-216eaa2927f424821a03d7c4c6bf701fdb48e865.zip | |
Fall back to Quick when Optimizing cannot compile.
Currently applies when seeing unresolved types/methods/fields,
and methods with try/catch.
Change-Id: I93b12d440b39f0b9faf98f08f2bfddedfeff7182
Diffstat (limited to 'compiler/dex/mir_graph.cc')
| -rw-r--r-- | compiler/dex/mir_graph.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index f354a49111..3103f96e4e 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -2459,11 +2459,9 @@ BasicBlock* MIRGraph::CreateNewBB(BBType block_type) { return res; } -void MIRGraph::CalculateBasicBlockInformation() { - auto* quick_compiler = down_cast<QuickCompiler*>(cu_->compiler_driver->GetCompiler()); - DCHECK(quick_compiler != nullptr); +void MIRGraph::CalculateBasicBlockInformation(const PassManager* const post_opt_pass_manager) { /* Create the pass driver and launch it */ - PassDriverMEPostOpt driver(quick_compiler->GetPostOptPassManager(), cu_); + PassDriverMEPostOpt driver(post_opt_pass_manager, cu_); driver.Launch(); } |