Chromium Code Reviews| Index: src/compiler/pipeline.cc |
| diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc |
| index 1c84bcf7b7a02154b8128cc5d855af253b4111a8..01043c6c4a329934b3b1de27cf9b29238954b24a 100644 |
| --- a/src/compiler/pipeline.cc |
| +++ b/src/compiler/pipeline.cc |
| @@ -552,9 +552,6 @@ PipelineCompilationJob::Status PipelineCompilationJob::PrepareJobImpl() { |
| if (!FLAG_always_opt) { |
| info()->MarkAsBailoutOnUninitialized(); |
| } |
| - if (FLAG_turbo_inlining) { |
| - info()->MarkAsInliningEnabled(); |
| - } |
| } |
| if (!info()->shared_info()->asm_function() || FLAG_turbo_asm_deoptimization) { |
| info()->MarkAsDeoptimizationEnabled(); |
| @@ -564,6 +561,10 @@ PipelineCompilationJob::Status PipelineCompilationJob::PrepareJobImpl() { |
| } |
| if (!info()->is_optimizing_from_bytecode()) { |
| if (!Compiler::EnsureDeoptimizationSupport(info())) return FAILED; |
| + } else { |
| + if (FLAG_turbo_inlining) { |
|
Yang
2016/11/24 07:30:49
just make this an 'else if'?
Benedikt Meurer
2016/11/24 07:34:08
Done.
|
| + info()->MarkAsInliningEnabled(); |
| + } |
| } |
| linkage_ = new (&zone_) Linkage(Linkage::ComputeIncoming(&zone_, info())); |