diff options
| author | David Brazdil <dbrazdil@google.com> | 2015-02-04 13:51:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-04 13:51:18 +0000 |
| commit | c2024144da54504d819869dc928ce4ac975634d4 (patch) | |
| tree | 13948cf9a32333337655f1ea4c3a2886bcea25cb /compiler/optimizing/inliner.cc | |
| parent | 53150eb4fb5c3bbcb0138b8dccb481726299f6ab (diff) | |
| parent | 5e8b137d28c840b128e2488f954cccee3e86db14 (diff) | |
| download | art-c2024144da54504d819869dc928ce4ac975634d4.tar.gz art-c2024144da54504d819869dc928ce4ac975634d4.tar.bz2 art-c2024144da54504d819869dc928ce4ac975634d4.zip | |
Merge "Create HGraph outside Builder, print timings"
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 41e516492a..32f6972c84 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -124,16 +124,18 @@ bool HInliner::TryInline(HInvoke* invoke_instruction, resolved_method->GetAccessFlags(), nullptr); + HGraph* callee_graph = + new (graph_->GetArena()) HGraph(graph_->GetArena(), graph_->GetCurrentInstructionId()); + OptimizingCompilerStats inline_stats; - HGraphBuilder builder(graph_->GetArena(), + HGraphBuilder builder(callee_graph, &dex_compilation_unit, &outer_compilation_unit_, &outer_dex_file, compiler_driver_, &inline_stats); - HGraph* callee_graph = builder.BuildGraph(*code_item, graph_->GetCurrentInstructionId()); - if (callee_graph == nullptr) { + if (!builder.BuildGraph(*code_item)) { VLOG(compiler) << "Method " << PrettyMethod(method_index, outer_dex_file) << " could not be built, so cannot be inlined"; return false; |