| Index: src/compiler/pipeline.cc
|
| diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
|
| index fdb5343ca62b7f844caa17833a52a82878b1ce25..a96e6bd34f74ebf0cad023926a2ccb19d2bee25a 100644
|
| --- a/src/compiler/pipeline.cc
|
| +++ b/src/compiler/pipeline.cc
|
| @@ -450,7 +450,10 @@ struct InliningPhase {
|
| void Run(PipelineData* data, Zone* temp_zone) {
|
| SourcePositionTable::Scope pos(data->source_positions(),
|
| SourcePosition::Unknown());
|
| - JSInliner inliner(temp_zone, data->info(), data->jsgraph());
|
| + JSInliner inliner(data->info()->is_inlining_enabled()
|
| + ? JSInliner::kGeneralInlining
|
| + : JSInliner::kBuiltinsInlining,
|
| + temp_zone, data->info(), data->jsgraph());
|
| GraphReducer graph_reducer(data->graph(), temp_zone);
|
| AddReducer(data, &graph_reducer, &inliner);
|
| graph_reducer.ReduceGraph();
|
| @@ -915,7 +918,7 @@ Handle<Code> Pipeline::GenerateCode() {
|
| RunPrintAndVerify("Context specialized", true);
|
| }
|
|
|
| - if (info()->is_inlining_enabled()) {
|
| + if (info()->is_builtin_inlining_enabled() || info()->is_inlining_enabled()) {
|
| Run<InliningPhase>();
|
| RunPrintAndVerify("Inlined", true);
|
| }
|
|
|