Revert "More lazy deoptimization in Turbofan (binops, loads/stores)"

src/compiler/operator-properties-inl.h

 // Copyright 2013 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.
 
 #ifndef V8_COMPILER_OPERATOR_PROPERTIES_INL_H_
 #define V8_COMPILER_OPERATOR_PROPERTIES_INL_H_
 
 #include "src/v8.h"
 
-#include "src/compiler/js-operator.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator-properties.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 inline bool OperatorProperties::HasValueInput(Operator* op) {
   return OperatorProperties::GetValueInputCount(op) > 0;
 }
@@ skipping 32 matching lines @@
 inline int OperatorProperties::GetControlInputCount(Operator* op) {
   switch (op->opcode()) {
     case IrOpcode::kPhi:
     case IrOpcode::kEffectPhi:
       return 1;
 #define OPCODE_CASE(x) case IrOpcode::k##x:
       CONTROL_OP_LIST(OPCODE_CASE)
 #undef OPCODE_CASE
       return static_cast<ControlOperator*>(op)->ControlInputCount();
     default:
-      // If a node can lazily deoptimize, it needs control dependency.
-      if (CanLazilyDeoptimize(op)) {
-        return 1;
-      }
       // Operators that have write effects must have a control
       // dependency. Effect dependencies only ensure the correct order of
       // write/read operations without consideration of control flow. Without an
       // explicit control dependency writes can be float in the schedule too
       // early along a path that shouldn't generate a side-effect.
       return op->HasProperty(Operator::kNoWrite) ? 0 : 1;
   }
   return 0;
 }
 
@@ skipping 51 matching lines @@
          opcode == IrOpcode::kPhi;
 }
 
 inline bool OperatorProperties::IsScheduleRoot(Operator* op) {
   uint8_t opcode = op->opcode();
   return opcode == IrOpcode::kEnd || opcode == IrOpcode::kEffectPhi ||
          opcode == IrOpcode::kPhi;
 }
 
 inline bool OperatorProperties::CanLazilyDeoptimize(Operator* op) {
-  // TODO(jarin) This function allows turning on lazy deoptimization
-  // incrementally. It will change as we turn on lazy deopt for
-  // more nodes.
-
-  if (!FLAG_turbo_deoptimization) {
-    return false;
+  if (op->opcode() == IrOpcode::kCall) {
+    CallOperator* call_op = reinterpret_cast<CallOperator*>(op);
+    CallDescriptor* descriptor = call_op->parameter();
+    return descriptor->CanLazilyDeoptimize();
   }
-
-  switch (op->opcode()) {
-    case IrOpcode::kCall: {
-      CallOperator* call_op = reinterpret_cast<CallOperator*>(op);
-      CallDescriptor* descriptor = call_op->parameter();
-      return descriptor->CanLazilyDeoptimize();
-    }
-    case IrOpcode::kJSCallRuntime: {
-      Runtime::FunctionId function =
-          reinterpret_cast<Operator1<Runtime::FunctionId>*>(op)->parameter();
-      // TODO(jarin) At the moment, we only support lazy deoptimization for
-      // the %DeoptimizeFunction runtime function.
-      return function == Runtime::kDeoptimizeFunction;
-    }
-
-    // JS function calls
-    case IrOpcode::kJSCallFunction:
-    case IrOpcode::kJSCallConstruct:
-
-    // Binary operations
-    case IrOpcode::kJSBitwiseOr:
-    case IrOpcode::kJSBitwiseXor:
-    case IrOpcode::kJSBitwiseAnd:
-    case IrOpcode::kJSShiftLeft:
-    case IrOpcode::kJSShiftRight:
-    case IrOpcode::kJSShiftRightLogical:
-    case IrOpcode::kJSAdd:
-    case IrOpcode::kJSSubtract:
-    case IrOpcode::kJSMultiply:
-    case IrOpcode::kJSDivide:
-    case IrOpcode::kJSModulus:
-    case IrOpcode::kJSLoadProperty:
-    case IrOpcode::kJSStoreProperty:
-    case IrOpcode::kJSLoadNamed:
-    case IrOpcode::kJSStoreNamed:
-      return true;
-
-    default:
-      return false;
+  if (op->opcode() == IrOpcode::kJSCallRuntime) {
+    // TODO(jarin) At the moment, we only support lazy deoptimization for
+    // the %DeoptimizeFunction runtime function.
+    Runtime::FunctionId function =
+        reinterpret_cast<Operator1<Runtime::FunctionId>*>(op)->parameter();
+    return function == Runtime::kDeoptimizeFunction;
   }
   return false;
 }
 }
 }
 }  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_OPERATOR_PROPERTIES_INL_H_