diff options
| author | 2015-03-10 18:12:14 +0000 | |
|---|---|---|
| committer | 2015-03-10 18:12:14 +0000 | |
| commit | 454c15907f9c00b0422356d9b4fa620b1736b572 (patch) | |
| tree | 89edf2d04e44c8adaf95e9d5a3d40698025d4cc3 /compiler/optimizing/inliner.cc | |
| parent | 79bf9a9eece6b99ffef61670a8fa2a0a3dbfc6a8 (diff) | |
| parent | 48e702fe11458b334e6abcc8f562729ccb5b27dd (diff) | |
am 48e702fe: Merge "Make the SSA builder honor the debuggable flag."
* commit '48e702fe11458b334e6abcc8f562729ccb5b27dd':
Make the SSA builder honor the debuggable flag.
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index b34957a17e..e22f7ccbf1 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -124,8 +124,8 @@ bool HInliner::TryInline(HInvoke* invoke_instruction, resolved_method->GetAccessFlags(), nullptr); - HGraph* callee_graph = - new (graph_->GetArena()) HGraph(graph_->GetArena(), graph_->GetCurrentInstructionId()); + HGraph* callee_graph = new (graph_->GetArena()) HGraph( + graph_->GetArena(), graph_->IsDebuggable(), graph_->GetCurrentInstructionId()); OptimizingCompilerStats inline_stats; HGraphBuilder builder(callee_graph, @@ -155,15 +155,11 @@ bool HInliner::TryInline(HInvoke* invoke_instruction, } // Run simple optimizations on the graph. - SsaRedundantPhiElimination redundant_phi(callee_graph); - SsaDeadPhiElimination dead_phi(callee_graph); HDeadCodeElimination dce(callee_graph); HConstantFolding fold(callee_graph); InstructionSimplifier simplify(callee_graph, stats_); HOptimization* optimizations[] = { - &redundant_phi, - &dead_phi, &dce, &fold, &simplify, |