[turbofan] Add an extra frame state for deoptimization before binary op.

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/access-builder.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/ast-graph-builder.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
+#include "src/compiler/operator-properties.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"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
@@ skipping 15 matching lines @@
     return call_->InputAt(static_cast<int>(2 + index));
   }
 
   size_t formal_arguments() {
     // {value_inputs} includes jsfunction and receiver.
     size_t value_inputs = call_->op()->ValueInputCount();
     DCHECK_GE(call_->InputCount(), 2);
     return value_inputs - 2;
   }
 
-  Node* frame_state() { return NodeProperties::GetFrameStateInput(call_); }
+  Node* frame_state() { return NodeProperties::GetFrameStateInput(call_, 0); }
 
  private:
   Node* call_;
 };
 
 
 namespace {
 
 // A facade on a JSFunction's graph to facilitate inlining. It assumes the
 // that the function graph has only one return statement, and provides
@@ skipping 305 matching lines @@
   if (FLAG_turbo_deoptimization) {
     Node* outer_frame_state = call.frame_state();
     // Insert argument adaptor frame if required.
     if (call.formal_arguments() != inlinee.formal_parameters()) {
       outer_frame_state =
           CreateArgumentsAdaptorFrameState(&call, function, info.zone());
     }
 
     for (Node* node : visitor.copies()) {
       if (node && node->opcode() == IrOpcode::kFrameState) {
+        DCHECK(OperatorProperties::GetFrameStateInputCount(node->op()) == 1);

[Benedikt Meurer, 2015/03/09 05:32:34]

DCHECK_EQ?

[Jarin, 2015/03/09 07:47:11]

Done.

         AddClosureToFrameState(node, function);
-        NodeProperties::ReplaceFrameStateInput(node, outer_frame_state);
+        NodeProperties::ReplaceFrameStateInput(node, 0, outer_frame_state);
       }
     }
   }
 
   return inlinee.InlineAtCall(jsgraph_, node);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8