Chromium Code Reviews| Index: src/compiler/js-inlining.cc |
| diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc |
| index fb1a722ab858eea7e3cb298b6b07924e5c03de0e..f4e29e25af4fbb04bba4107a4db5a61ec25cfa08 100644 |
| --- a/src/compiler/js-inlining.cc |
| +++ b/src/compiler/js-inlining.cc |
| @@ -348,6 +348,10 @@ Reduction JSInliner::ReduceJSCallFunction(Node* node, |
| info_->shared_info()->DebugName()->ToCString().get()); |
| return NoChange(); |
| } |
| + // Remember that we inlined this function. This needs to be called right |
| + // after we ensure deoptimization support so that the code flusher |
| + // does not remove the code with the deoptimization support. |
| + info_->AddInlinedFunction(info.shared_info()); |
|
Michael Starzinger
2015/10/21 13:49:50
nit: Can we add a separator comment here, together
Jarin
2015/10/21 14:31:46
Done.
|
| TRACE("Inlining %s into %s\n", |
| function->shared()->DebugName()->ToCString().get(), |
| @@ -407,9 +411,6 @@ Reduction JSInliner::ReduceJSCallFunction(Node* node, |
| info.zone()); |
| } |
| - // Remember that we inlined this function. |
| - info_->AddInlinedFunction(info.shared_info()); |
| - |
| return InlineCall(node, context, frame_state, start, end); |
| } |