[turbofan] Unify frame state inputs.

src/compiler/js-type-feedback.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-type-feedback.h"
 
 #include "src/property-details.h"
 
 #include "src/accessors.h"
 #include "src/ast.h"
@@ skipping 43 matching lines @@
     case IrOpcode::kJSLoadNamed:
       return ReduceJSLoadNamed(node);
     case IrOpcode::kJSStoreNamed:
       return ReduceJSStoreNamed(node);
     case IrOpcode::kJSStoreProperty: {
       HeapObjectMatcher<Name> match(node->InputAt(1));
       if (match.HasValue() && match.Value().handle()->IsName()) {
         // StoreProperty(o, "constant", v) => StoreNamed["constant"](o, v).
         Unique<Name> name = match.Value();
         LanguageMode language_mode = OpParameter<LanguageMode>(node);
-        if (FLAG_turbo_deoptimization) {
-          // StoreProperty has 2 frame state inputs, but StoreNamed only 1.
-          DCHECK_EQ(2, OperatorProperties::GetFrameStateInputCount(node->op()));
-          node->RemoveInput(NodeProperties::FirstFrameStateIndex(node) + 1);
-        }
+        // StoreProperty has 2 frame state inputs, but StoreNamed only 1.
+        DCHECK_EQ(2, OperatorProperties::GetFrameStateInputCount(node->op()));
+        node->RemoveInput(NodeProperties::FirstFrameStateIndex(node) + 1);
         node->set_op(
             jsgraph()->javascript()->StoreNamed(language_mode, name, KEYED));
         node->RemoveInput(1);
         return ReduceJSStoreNamed(node);
       }
       return ReduceJSStoreProperty(node);
     }
     default:
       break;
   }
@@ skipping 62 matching lines @@
     return true;
   }
 
   // TODO(turbofan): handle out of object properties.
   return false;
 }
 
 
 Reduction JSTypeFeedbackSpecializer::ReduceJSLoadNamed(Node* node) {
   DCHECK(node->opcode() == IrOpcode::kJSLoadNamed);
-  // TODO(turbofan): type feedback currently requires deoptimization.
-  if (!FLAG_turbo_deoptimization) return NoChange();
   // TODO(titzer): deopt locations are wrong for property accesses
   if (!EAGER_DEOPT_LOCATIONS_FOR_PROPERTY_ACCESS_ARE_CORRECT) return NoChange();
 
   // TODO(turbofan): handle vector-based type feedback.
   TypeFeedbackId id = js_type_feedback_->find(node);
   if (id.IsNone() || oracle()->LoadInlineCacheState(id) == UNINITIALIZED) {
     return NoChange();
   }
 
   const LoadNamedParameters& p = LoadNamedParametersOf(node->op());
@@ skipping 32 matching lines @@
 }
 
 
 Reduction JSTypeFeedbackSpecializer::ReduceJSLoadProperty(Node* node) {
   return NoChange();
 }
 
 
 Reduction JSTypeFeedbackSpecializer::ReduceJSStoreNamed(Node* node) {
   DCHECK(node->opcode() == IrOpcode::kJSStoreNamed);
-  // TODO(turbofan): type feedback currently requires deoptimization.
-  if (!FLAG_turbo_deoptimization) return NoChange();
   // TODO(titzer): deopt locations are wrong for property accesses
   if (!EAGER_DEOPT_LOCATIONS_FOR_PROPERTY_ACCESS_ARE_CORRECT) return NoChange();
 
   TypeFeedbackId id = js_type_feedback_->find(node);
   if (id.IsNone() || oracle()->StoreIsUninitialized(id)) return NoChange();
 
   const StoreNamedParameters& p = StoreNamedParametersOf(node->op());
   SmallMapList maps;
   Handle<Name> name = p.name().handle();
   Node* receiver = node->InputAt(0);
@@ skipping 73 matching lines @@
   // TODO(turbofan): filter maps by initial receiver map if known
   // TODO(turbofan): filter maps by native context (if specializing)
   // TODO(turbofan): filter maps by effect chain
   oracle()->PropertyReceiverTypes(id, name, maps);
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8