Add handling for deopt and argument adaptor frames.

src/compiler/js-inlining.cc

Index: src/compiler/js-inlining.cc
diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc
index b908ae81f7a2cf88cf9c2488f141758859ab79d0..645fa93ccde504f9e6af3d36f53d6a5f723fc23e 100644
--- a/src/compiler/js-inlining.cc
+++ b/src/compiler/js-inlining.cc
@@ -15,6 +15,7 @@
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/typer.h"
+#include "src/full-codegen.h"
 #include "src/parser.h"
 #include "src/rewriter.h"
 #include "src/scopes.h"
@@ -54,7 +55,6 @@ void JSInliner::Inline() {
 // test cases, where similar code is currently duplicated).
 static void Parse(Handle<JSFunction> function, CompilationInfoWithZone* info) {
   CHECK(Parser::Parse(info));
-  info->SetOptimizing(BailoutId::None(), Handle<Code>(function->code()));
   CHECK(Rewriter::Rewrite(info));
   CHECK(Scope::Analyze(info));
   CHECK_NE(NULL, info->scope());
@@ -90,6 +90,16 @@ class Inlinee {
     DCHECK_EQ(IrOpcode::kReturn, unique_return->opcode());
     return unique_return;
   }
+
+  // Counts JSFunction, Receiver, arguments, context but not effect, control.
+  size_t total_parameters() { return start_->op()->OutputCount(); }
+
+  // Counts only formal parameters.
+  size_t formal_parameters() {
+    DCHECK_GE(total_parameters(), 3);
+    return total_parameters() - 3;
+  }
+
   // Inline this graph at {call}, use {jsgraph} and its zone to create
   // any new nodes.
   void InlineAtCall(JSGraph* jsgraph, Node* call);
@@ -196,7 +206,7 @@ class CopyVisitor : public NullNodeVisitor {
 
  private:
   void ReplaceSentinels() {
-    for (int id = 0; id < source_graph_->NodeCount(); ++id) {
+    for (NodeId id = 0; id < source_graph_->NodeCount(); ++id) {
       Node* sentinel = sentinels_[id];
       if (sentinel == NULL) continue;
       Node* copy = copies_[id];
@@ -235,11 +245,8 @@ void Inlinee::InlineAtCall(JSGraph* jsgraph, Node* call) {
       NodeProperties::GetValueInput(call, 0),
       NodeProperties::GetEffectInput(call));
 
-  // {inlinee_inputs} counts JSFunction, Receiver, arguments, context,
-  // but not effect, control.
-  int inlinee_inputs = start_->op()->OutputCount();
   // Context is last argument.
-  int inlinee_context_index = inlinee_inputs - 1;
+  int inlinee_context_index = static_cast<int>(total_parameters()) - 1;
   // {inliner_inputs} counts JSFunction, Receiver, arguments, but not
   // context, effect, control.
   int inliner_inputs = OperatorProperties::GetValueInputCount(call->op());
@@ -299,10 +306,75 @@ void Inlinee::InlineAtCall(JSGraph* jsgraph, Node* call) {
 }
 
 
-void JSInliner::TryInlineCall(Node* call) {
-  DCHECK_EQ(IrOpcode::kJSCallFunction, call->opcode());
+// TODO(turbofan) Provide such accessors for every node, possibly even
+// generate them.
+class JSCallFunctionAccessor {
+ public:
+  explicit JSCallFunctionAccessor(Node* call) : call_(call) {
+    DCHECK_EQ(IrOpcode::kJSCallFunction, call->opcode());
+  }
+
+  Node* jsfunction() { return call_->InputAt(0); }
+
+  Node* receiver() { return call_->InputAt(1); }
+
+  Node* formal_argument(size_t index) {
+    DCHECK(index < formal_arguments());
+    return call_->InputAt(static_cast<int>(2 + index));
+  }
+
+  size_t formal_arguments() {
+    // {value_inputs} includes jsfunction and receiver.
+    size_t value_inputs = OperatorProperties::GetValueInputCount(call_->op());
+    DCHECK_GE(call_->InputCount(), 2);
+    return value_inputs - 2;
+  }
+
+  Node* frame_state() { return NodeProperties::GetFrameStateInput(call_); }
+
+ private:
+  Node* call_;
+};
+
 
-  HeapObjectMatcher<JSFunction> match(call->InputAt(0));
+static void AddClosureToFrameState(JSGraph* jsgraph, Node* frame_state,

[Michael Starzinger, 2014/09/17 13:31:43]

nit: This could be turned into a member method in JSInliner, avoiding the need
to pass the JSGraph around.

[sigurds, 2014/09/17 14:05:12]

Done.

+                                   Handle<JSFunction> jsfunction) {
+  FrameStateCallInfo call_info = OpParameter<FrameStateCallInfo>(frame_state);
+  const Operator* op = jsgraph->common()->FrameState(
+      FrameStateType::JS_FRAME, call_info.bailout_id(),
+      call_info.state_combine(), jsfunction);
+  frame_state->set_op(op);
+}
+
+
+static Node* CreateArgumentsAdaptorFrameState(JSGraph* jsgraph,

[Michael Starzinger, 2014/09/17 13:31:43]

nit: This could be turned into a member method in JSInliner, avoiding the need
to pass the JSGraph and the Zone around.

[sigurds, 2014/09/17 14:05:12]

Done.

+                                              JSCallFunctionAccessor* call,
+                                              Handle<JSFunction> jsfunction,
+                                              Zone* temp_zone) {
+  const Operator* op =
+      jsgraph->common()->FrameState(FrameStateType::ARGUMENTS_ADAPTOR,
+                                    BailoutId(-1), kIgnoreOutput, jsfunction);
+  const Operator* op0 = jsgraph->common()->StateValues(0);
+  Node* node0 = jsgraph->graph()->NewNode(op0);
+  NodeVector params(temp_zone);
+  params.push_back(call->receiver());
+  for (size_t argument = 0; argument != call->formal_arguments(); ++argument) {
+    params.push_back(call->formal_argument(argument));
+  }
+  const Operator* op_param =
+      jsgraph->common()->StateValues(static_cast<int>(params.size()));
+  Node* params_node = jsgraph->graph()->NewNode(
+      op_param, static_cast<int>(params.size()), &params.front());
+  return jsgraph->graph()->NewNode(op, params_node, node0, node0,
+                                   jsgraph->UndefinedConstant(),
+                                   call->frame_state());
+}
+
+
+void JSInliner::TryInlineCall(Node* call_node) {
+  JSCallFunctionAccessor call(call_node);
+
+  HeapObjectMatcher<JSFunction> match(call.jsfunction());
   if (!match.HasValue()) {
     return;
   }
@@ -322,6 +394,18 @@ void JSInliner::TryInlineCall(Node* call) {
   CompilationInfoWithZone info(function);
   Parse(function, &info);
 
+  if (!function->shared()->has_deoptimization_support()) {
+    // TODO(turbofan) In the future, unoptimized code with deopt support could
+    // be generated lazily once deopt is triggered.
+    info.EnableDeoptimizationSupport();
+    if (!FullCodeGenerator::MakeCode(&info)) {
+      DCHECK(false);
+      return;
+    }
+    function->shared()->EnableDeoptimizationSupport(*info.code());
+    function->shared()->set_feedback_vector(*info.feedback_vector());
+  }
+
   if (info.scope()->arguments() != NULL) {
     // For now do not inline functions that use their arguments array.
     SmartArrayPointer<char> name = function->shared()->DebugName()->ToCString();
@@ -353,7 +437,23 @@ void JSInliner::TryInlineCall(Node* call) {
   visitor.CopyGraph();
 
   Inlinee inlinee(visitor.GetCopy(graph.start()), visitor.GetCopy(graph.end()));
-  inlinee.InlineAtCall(jsgraph_, call);
+
+  for (NodeVectorConstIter it = visitor.copies().begin();
+       it != visitor.copies().end(); ++it) {
+    Node* node = *it;
+    if (node != NULL && node->opcode() == IrOpcode::kFrameState) {
+      AddClosureToFrameState(jsgraph_, node, function);
+      Node* outer_frame_state = call.frame_state();
+      // Insert argument adaptor frame if required.
+      if (call.formal_arguments() != inlinee.formal_parameters()) {
+        outer_frame_state = CreateArgumentsAdaptorFrameState(

[Michael Starzinger, 2014/09/17 13:31:43]

This create a new arguments-adaptor FrameState for every inner FrameState. I
think we should be able to share the arguments adaptor (i.e. create only one per
call-site).

[sigurds, 2014/09/17 14:05:13]

Good catch, thanks!

+            jsgraph_, &call, function, info.zone());
+      }
+      NodeProperties::ReplaceFrameStateInput(node, outer_frame_state);
+    }
+  }
+
+  inlinee.InlineAtCall(jsgraph_, call_node);
 }
 }
 }