Revert of [turbofan] Connect ObjectIsNumber to effect and control chains.

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/address-map.h"
 #include "src/code-factory.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/linkage.h"
@@ skipping 578 matching lines @@
 }
 
 Node* ChangeLowering::IsSmi(Node* value) {
   return graph()->NewNode(
       machine()->WordEqual(),
       graph()->NewNode(machine()->WordAnd(), value,
                        jsgraph()->IntPtrConstant(kSmiTagMask)),
       jsgraph()->IntPtrConstant(kSmiTag));
 }
 
-Node* ChangeLowering::LoadHeapObjectMap(Node* object, Node* effect,
-                                        Node* control) {
+Node* ChangeLowering::LoadHeapObjectMap(Node* object, Node* control) {
   return graph()->NewNode(
       machine()->Load(MachineType::AnyTagged()), object,
       jsgraph()->IntPtrConstant(HeapObject::kMapOffset - kHeapObjectTag),
-      effect, control);
+      graph()->start(), control);
 }
 
-Node* ChangeLowering::LoadMapInstanceType(Node* map, Node* effect,
-                                          Node* control) {
+Node* ChangeLowering::LoadMapInstanceType(Node* map) {
   return graph()->NewNode(
       machine()->Load(MachineType::Uint8()), map,
       jsgraph()->IntPtrConstant(Map::kInstanceTypeOffset - kHeapObjectTag),
-      effect, control);
+      graph()->start(), graph()->start());
 }
 
 Reduction ChangeLowering::ObjectIsNumber(Node* node) {
   Node* input = NodeProperties::GetValueInput(node, 0);
-  Node* control = NodeProperties::GetControlInput(node, 0);
-  Node* effect = NodeProperties::GetEffectInput(node, 0);
   // TODO(bmeurer): Optimize somewhat based on input type.
   Node* check = IsSmi(input);
-  Node* branch = graph()->NewNode(common()->Branch(), check, control);
+  Node* branch = graph()->NewNode(common()->Branch(), check, graph()->start());
   Node* if_true = graph()->NewNode(common()->IfTrue(), branch);
   Node* vtrue = jsgraph()->Int32Constant(1);
   Node* if_false = graph()->NewNode(common()->IfFalse(), branch);
-  Node* load_map = LoadHeapObjectMap(input, effect, if_false);
   Node* vfalse = graph()->NewNode(
-      machine()->WordEqual(), load_map,
+      machine()->WordEqual(), LoadHeapObjectMap(input, if_false),
       jsgraph()->HeapConstant(isolate()->factory()->heap_number_map()));
-  Node* merge = graph()->NewNode(common()->Merge(2), if_true, if_false);
-  Node* ephi =
-      graph()->NewNode(common()->EffectPhi(2), effect, load_map, merge);
-  Node* phi = graph()->NewNode(common()->Phi(MachineRepresentation::kBit, 2),
-                               vtrue, vfalse, merge);
-  ReplaceWithValue(node, phi, ephi, merge);
+  Node* control = graph()->NewNode(common()->Merge(2), if_true, if_false);
+  node->ReplaceInput(0, vtrue);
+  node->AppendInput(graph()->zone(), vfalse);
+  node->AppendInput(graph()->zone(), control);
+  NodeProperties::ChangeOp(node, common()->Phi(MachineRepresentation::kBit, 2));
   return Changed(node);
 }
 
 Reduction ChangeLowering::ObjectIsReceiver(Node* node) {
   Node* input = NodeProperties::GetValueInput(node, 0);
   // TODO(bmeurer): Optimize somewhat based on input type.
   STATIC_ASSERT(LAST_TYPE == LAST_JS_RECEIVER_TYPE);
   Node* check = IsSmi(input);
   Node* branch = graph()->NewNode(common()->Branch(), check, graph()->start());
   Node* if_true = graph()->NewNode(common()->IfTrue(), branch);
   Node* vtrue = jsgraph()->Int32Constant(0);
   Node* if_false = graph()->NewNode(common()->IfFalse(), branch);
-  Node* load_map = LoadHeapObjectMap(input, graph()->start(), if_false);
-  Node* load_instance_type =
-      LoadMapInstanceType(load_map, graph()->start(), graph()->start());
-  Node* vfalse = graph()->NewNode(
-      machine()->Uint32LessThanOrEqual(),
-      jsgraph()->Uint32Constant(FIRST_JS_RECEIVER_TYPE), load_instance_type);
+  Node* vfalse =
+      graph()->NewNode(machine()->Uint32LessThanOrEqual(),
+                       jsgraph()->Uint32Constant(FIRST_JS_RECEIVER_TYPE),
+                       LoadMapInstanceType(LoadHeapObjectMap(input, if_false)));
   Node* control = graph()->NewNode(common()->Merge(2), if_true, if_false);
   node->ReplaceInput(0, vtrue);
   node->AppendInput(graph()->zone(), vfalse);
   node->AppendInput(graph()->zone(), control);
   NodeProperties::ChangeOp(node, common()->Phi(MachineRepresentation::kBit, 2));
   return Changed(node);
 }
 
 Reduction ChangeLowering::ObjectIsSmi(Node* node) {
   node->ReplaceInput(0,
@@ skipping 15 matching lines @@
 }
 
 
 MachineOperatorBuilder* ChangeLowering::machine() const {
   return jsgraph()->machine();
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8