[turbofan] Unify frame state inputs.

src/compiler/change-lowering.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/change-lowering.h"
 
 #include "src/code-factory.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
@@ skipping 223 matching lines @@
 
 Reduction ChangeLowering::ChangeTaggedToFloat64(Node* value, Node* control) {
   if (CanCover(value, IrOpcode::kJSToNumber)) {
     // ChangeTaggedToFloat64(JSToNumber(x)) =>
     //   if IsSmi(x) then ChangeSmiToFloat64(x)
     //   else let y = JSToNumber(x) in
     //     if IsSmi(y) then ChangeSmiToFloat64(y)
     //     else LoadHeapNumberValue(y)
     Node* const object = NodeProperties::GetValueInput(value, 0);
     Node* const context = NodeProperties::GetContextInput(value);
+    Node* const frame_state = NodeProperties::GetFrameStateInput(value, 0);
     Node* const effect = NodeProperties::GetEffectInput(value);
     Node* const control = NodeProperties::GetControlInput(value);
 
     const Operator* merge_op = common()->Merge(2);
     const Operator* ephi_op = common()->EffectPhi(2);
     const Operator* phi_op = common()->Phi(kMachFloat64, 2);
 
     Node* check1 = TestNotSmi(object);
     Node* branch1 =
         graph()->NewNode(common()->Branch(BranchHint::kFalse), check1, control);
 
     Node* if_true1 = graph()->NewNode(common()->IfTrue(), branch1);
-    Node* vtrue1 =
-        FLAG_turbo_deoptimization
-            ? graph()->NewNode(value->op(), object, context,
-                               NodeProperties::GetFrameStateInput(value, 0),
-                               effect, if_true1)
-            : graph()->NewNode(value->op(), object, context, effect, if_true1);
+    Node* vtrue1 = graph()->NewNode(value->op(), object, context, frame_state,
+                                    effect, if_true1);
     Node* etrue1 = vtrue1;
     {
       Node* check2 = TestNotSmi(vtrue1);
       Node* branch2 = graph()->NewNode(common()->Branch(), check2, if_true1);
 
       Node* if_true2 = graph()->NewNode(common()->IfTrue(), branch2);
       Node* vtrue2 = LoadHeapNumberValue(vtrue1, if_true2);
 
       Node* if_false2 = graph()->NewNode(common()->IfFalse(), branch2);
       Node* vfalse2 = ChangeSmiToFloat64(vtrue1);
@@ skipping 68 matching lines @@
 }
 
 
 MachineOperatorBuilder* ChangeLowering::machine() const {
   return jsgraph()->machine();
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8