diff options
| author | 2015-06-08 15:52:23 +0000 | |
|---|---|---|
| committer | 2015-06-08 15:54:14 +0000 | |
| commit | 6e4758615308bb525b6350c30468e33a2e1f2274 (patch) | |
| tree | 0a9fbb0f1f90dfe273d94659f077cc1e6b84966c /compiler/optimizing/optimizing_compiler.cc | |
| parent | 1d5006c34d75758752bf3499892e3d5beb11d5dc (diff) | |
Revert "Support for inlining virtual and interface calls."
Fails for some apps.
bug: 21674542
This reverts commit 1d5006c34d75758752bf3499892e3d5beb11d5dc.
Change-Id: Ia74b5e54d59f8ffe9992591324a12f71efb67af4
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index bf0b9fac0f..f6ef2f7e82 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -326,7 +326,7 @@ static void RunOptimizations(HGraph* graph, InstructionSimplifier simplify1(graph, stats); HBooleanSimplifier boolean_simplify(graph); - HInliner inliner(graph, dex_compilation_unit, dex_compilation_unit, driver, handles, stats); + HInliner inliner(graph, dex_compilation_unit, dex_compilation_unit, driver, stats); HConstantFolding fold2(graph, "constant_folding_after_inlining"); SideEffectsAnalysis side_effects(graph); @@ -335,8 +335,6 @@ static void RunOptimizations(HGraph* graph, BoundsCheckElimination bce(graph); ReferenceTypePropagation type_propagation(graph, handles); InstructionSimplifier simplify2(graph, stats, "instruction_simplifier_after_types"); - InstructionSimplifier simplify3(graph, stats, "last_instruction_simplifier"); - ReferenceTypePropagation type_propagation2(graph, handles); IntrinsicsRecognizer intrinsics(graph, driver); @@ -345,12 +343,7 @@ static void RunOptimizations(HGraph* graph, &dce1, &fold1, &simplify1, - &type_propagation, - &simplify2, &inliner, - // Run another type propagation phase: inlining will open up more opprotunities - // to remove checkast/instanceof and null checks. - &type_propagation2, // BooleanSimplifier depends on the InstructionSimplifier removing redundant // suspend checks to recognize empty blocks. &boolean_simplify, @@ -359,7 +352,8 @@ static void RunOptimizations(HGraph* graph, &gvn, &licm, &bce, - &simplify3, + &type_propagation, + &simplify2, &dce2, }; |