Introduce a reference to the code object of inlined functions in CompilationInfo.

src/compiler/js-inlining.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/js-inlining.h"
 
 #include "src/ast.h"
 #include "src/ast-numbering.h"
 #include "src/compiler.h"
 #include "src/compiler/all-nodes.h"
@@ skipping 330 matching lines @@
     }
     return NoChange();
   }
 
   if (!Compiler::EnsureDeoptimizationSupport(&info)) {
     TRACE("Not inlining %s into %s because deoptimization support failed\n",
           function->shared()->DebugName()->ToCString().get(),
           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 with a comment that this is
the point where we decided that inlining is going to happen. It's the "point of
no return" for the inliner.

[Jarin, 2015/10/21 14:31:46]

Done.

   TRACE("Inlining %s into %s\n",
         function->shared()->DebugName()->ToCString().get(),
         info_->shared_info()->DebugName()->ToCString().get());
 
   Graph graph(info.zone());
   JSGraph jsgraph(info.isolate(), &graph, jsgraph_->common(),
                   jsgraph_->javascript(), jsgraph_->simplified(),
                   jsgraph_->machine());
   AstGraphBuilder graph_builder(local_zone_, &info, &jsgraph);
   graph_builder.CreateGraph(false);
@@ skipping 32 matching lines @@
   Node* end = visitor.GetCopy(graph.end());
 
   Node* frame_state = call.frame_state();
   size_t const inlinee_formal_parameters = start->op()->ValueOutputCount() - 3;
   // Insert argument adaptor frame if required.
   if (call.formal_arguments() != inlinee_formal_parameters) {
     // In strong mode, in case of too few arguments we need to throw a
     // TypeError so we must not inline this call.
     if (is_strong(info.language_mode()) &&
         call.formal_arguments() < inlinee_formal_parameters) {
       return NoChange();

[Michael Starzinger, 2015/10/21 13:49:50]

nit: Can we add a TODO here that this bailout needs to be moved up to before the
line mentioned above?

[Jarin, 2015/10/21 14:31:46]

Done.

     }
     frame_state = CreateArgumentsAdaptorFrameState(&call, info.shared_info(),
                                                    info.zone());
   }
 
-  // Remember that we inlined this function.
-  info_->AddInlinedFunction(info.shared_info());
-
   return InlineCall(node, context, frame_state, start, end);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8