diff options
| author | 2018-06-28 17:30:16 +0100 | |
|---|---|---|
| committer | 2018-06-28 17:55:01 +0100 | |
| commit | bb089b6bf850c87e0e42917a383cc7298dcb09c5 (patch) | |
| tree | 9076775ab1a00bf7321a6b4a457ddd81f20c10c1 /compiler/optimizing/inliner.cc | |
| parent | b5271dd44a30f498689e503340d3c8d01bf31f07 (diff) | |
Remove CompilerDriver::support_boot_image_fixup_.
Check for non-PIC boot image as a testing config instead.
Honor the config for HInvokeStaticOrDirect sharpening.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I3645f4fefe322f1fd64ea88a2b41a35ceccea688
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index a104070dd3..3ba741472e 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -949,7 +949,7 @@ HInstruction* HInliner::AddTypeGuard(HInstruction* receiver, invoke_instruction->GetDexPc(), /* needs_access_check */ false); HLoadClass::LoadKind kind = HSharpening::ComputeLoadClassKind( - load_class, codegen_, compiler_driver_, caller_compilation_unit_); + load_class, codegen_, caller_compilation_unit_); DCHECK(kind != HLoadClass::LoadKind::kInvalid) << "We should always be able to reference a class for inline caches"; // Load kind must be set before inserting the instruction into the graph. @@ -2022,8 +2022,8 @@ void HInliner::RunOptimizations(HGraph* callee_graph, // optimization that could lead to a HDeoptimize. The following optimizations do not. HDeadCodeElimination dce(callee_graph, inline_stats_, "dead_code_elimination$inliner"); HConstantFolding fold(callee_graph, "constant_folding$inliner"); - HSharpening sharpening(callee_graph, codegen_, compiler_driver_); - InstructionSimplifier simplify(callee_graph, codegen_, compiler_driver_, inline_stats_); + HSharpening sharpening(callee_graph, codegen_); + InstructionSimplifier simplify(callee_graph, codegen_, inline_stats_); IntrinsicsRecognizer intrinsics(callee_graph, inline_stats_); HOptimization* optimizations[] = { |