[turbofan] Unify frame state inputs.

src/compiler/js-intrinsic-lowering.cc

-
 // Copyright 2015 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-intrinsic-lowering.h"
 
 #include <stack>
 
 #include "src/code-factory.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node-properties.h"
+#include "src/compiler/operator-properties.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 JSIntrinsicLowering::JSIntrinsicLowering(JSGraph* jsgraph)
     : jsgraph_(jsgraph), simplified_(jsgraph->zone()) {}
 
 
 Reduction JSIntrinsicLowering::Reduce(Node* node) {
@@ skipping 81 matching lines @@
   int flags = FastD2I(mflags.Value());
 
   // Use the FastCloneShallowArrayStub only for shallow boilerplates up to the
   // initial length limit for arrays with "fast" elements kind.
   if ((flags & ArrayLiteral::kShallowElements) != 0 &&
       length < JSObject::kInitialMaxFastElementArray) {
     Isolate* isolate = jsgraph()->isolate();
     Callable callable = CodeFactory::FastCloneShallowArray(isolate);
     CallDescriptor* desc = Linkage::GetStubCallDescriptor(
         isolate, graph()->zone(), callable.descriptor(), 0,
-        FLAG_turbo_deoptimization ? CallDescriptor::kNeedsFrameState
-                                  : CallDescriptor::kNoFlags);
+        (OperatorProperties::GetFrameStateInputCount(node->op()) != 0)
+            ? CallDescriptor::kNeedsFrameState
+            : CallDescriptor::kNoFlags);
     const Operator* new_op = common()->Call(desc);
     Node* stub_code = jsgraph()->HeapConstant(callable.code());
     node->RemoveInput(3);  // Remove flags input from node.
     node->InsertInput(graph()->zone(), 0, stub_code);
     node->set_op(new_op);
     return Changed(node);
   }
 
   return NoChange();
 }
 
 
 Reduction JSIntrinsicLowering::ReduceCreateObjectLiteral(Node* node) {
   HeapObjectMatcher<FixedArray> mconst(NodeProperties::GetValueInput(node, 2));
   NumberMatcher mflags(NodeProperties::GetValueInput(node, 3));
   // Constants are pairs, see ObjectLiteral::properties_count().
   int length = mconst.Value().handle()->length() / 2;
   int flags = FastD2I(mflags.Value());
 
   // Use the FastCloneShallowObjectStub only for shallow boilerplates without
   // elements up to the number of properties that the stubs can handle.
   if ((flags & ObjectLiteral::kShallowProperties) != 0 &&
       length <= FastCloneShallowObjectStub::kMaximumClonedProperties) {
     Isolate* isolate = jsgraph()->isolate();
     Callable callable = CodeFactory::FastCloneShallowObject(isolate, length);
     CallDescriptor* desc = Linkage::GetStubCallDescriptor(
         isolate, graph()->zone(), callable.descriptor(), 0,
-        FLAG_turbo_deoptimization ? CallDescriptor::kNeedsFrameState
-                                  : CallDescriptor::kNoFlags);
+        (OperatorProperties::GetFrameStateInputCount(node->op()) != 0)
+            ? CallDescriptor::kNeedsFrameState
+            : CallDescriptor::kNoFlags);
     const Operator* new_op = common()->Call(desc);
     Node* stub_code = jsgraph()->HeapConstant(callable.code());
     node->InsertInput(graph()->zone(), 0, stub_code);
     node->set_op(new_op);
     return Changed(node);
   }
 
   return NoChange();
 }
 
 
 Reduction JSIntrinsicLowering::ReduceDeoptimizeNow(Node* node) {
-  if (!FLAG_turbo_deoptimization) return NoChange();
+  // TODO(bmeurer): if (!FLAG_turbo_deoptimization) return NoChange();

[Jarin, 2015/04/23 08:33:08]

I think we should keep the check here, so that we do not crash on clusterfuzz.
(This basically means ignoring the deoptimization.)

[Benedikt Meurer, 2015/04/23 08:35:34]

Done.

 
   Node* frame_state = NodeProperties::GetFrameStateInput(node, 0);
   DCHECK_EQ(frame_state->opcode(), IrOpcode::kFrameState);
 
   Node* effect = NodeProperties::GetEffectInput(node);
   Node* control = NodeProperties::GetControlInput(node);
 
   // We are making the continuation after the call dead. To
   // model this, we generate if (true) statement with deopt
   // in the true branch and continuation in the false branch.
@@ skipping 315 matching lines @@
 }
 
 
 MachineOperatorBuilder* JSIntrinsicLowering::machine() const {
   return jsgraph()->machine();
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8