Revert of [turbofan] Run DeadCodeElimination together with the advanced reducers.

test/unittests/compiler/graph-reducer-unittest.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/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
 #include "test/unittests/compiler/graph-reducer-unittest.h"
 #include "test/unittests/test-utils.h"
@@ skipping 274 matching lines @@
 const IfExceptionHint kNoHint = IfExceptionHint::kLocallyCaught;
 
 }  // namespace
 
 
 TEST_F(AdvancedReducerTest, ReplaceWithValue_ValueUse) {
   CommonOperatorBuilder common(zone());
   Node* node = graph()->NewNode(&kMockOperator);
   Node* use_value = graph()->NewNode(common.Return(), node);
   Node* replacement = graph()->NewNode(&kMockOperator);
-  GraphReducer graph_reducer(zone(), graph(), nullptr);
+  GraphReducer graph_reducer(zone(), graph(), nullptr, nullptr);
   ReplaceWithValueReducer r(&graph_reducer);
   r.ReplaceWithValue(node, replacement);
   EXPECT_EQ(replacement, use_value->InputAt(0));
   EXPECT_EQ(0, node->UseCount());
   EXPECT_EQ(1, replacement->UseCount());
   EXPECT_THAT(replacement->uses(), ElementsAre(use_value));
 }
 
 
 TEST_F(AdvancedReducerTest, ReplaceWithValue_EffectUse) {
   CommonOperatorBuilder common(zone());
   Node* start = graph()->NewNode(common.Start(1));
   Node* node = graph()->NewNode(&kMockOpEffect, start);
   Node* use_effect = graph()->NewNode(common.EffectPhi(1), node);
   Node* replacement = graph()->NewNode(&kMockOperator);
-  GraphReducer graph_reducer(zone(), graph(), nullptr);
+  GraphReducer graph_reducer(zone(), graph(), nullptr, nullptr);
   ReplaceWithValueReducer r(&graph_reducer);
   r.ReplaceWithValue(node, replacement);
   EXPECT_EQ(start, use_effect->InputAt(0));
   EXPECT_EQ(0, node->UseCount());
   EXPECT_EQ(2, start->UseCount());
   EXPECT_EQ(0, replacement->UseCount());
   EXPECT_THAT(start->uses(), UnorderedElementsAre(use_effect, node));
 }
 
 
 TEST_F(AdvancedReducerTest, ReplaceWithValue_ControlUse1) {
   CommonOperatorBuilder common(zone());
   Node* start = graph()->NewNode(common.Start(1));
   Node* node = graph()->NewNode(&kMockOpControl, start);
   Node* success = graph()->NewNode(common.IfSuccess(), node);
   Node* use_control = graph()->NewNode(common.Merge(1), success);
   Node* replacement = graph()->NewNode(&kMockOperator);
-  GraphReducer graph_reducer(zone(), graph(), nullptr);
+  GraphReducer graph_reducer(zone(), graph(), nullptr, nullptr);
   ReplaceWithValueReducer r(&graph_reducer);
   r.ReplaceWithValue(node, replacement);
   EXPECT_EQ(start, use_control->InputAt(0));
   EXPECT_EQ(0, node->UseCount());
   EXPECT_EQ(2, start->UseCount());
   EXPECT_EQ(0, replacement->UseCount());
   EXPECT_THAT(start->uses(), UnorderedElementsAre(use_control, node));
 }
 
 
 TEST_F(AdvancedReducerTest, ReplaceWithValue_ControlUse2) {
   CommonOperatorBuilder common(zone());
   Node* start = graph()->NewNode(common.Start(1));
   Node* effect = graph()->NewNode(&kMockOperator);
   Node* dead = graph()->NewNode(&kMockOperator);
   Node* node = graph()->NewNode(&kMockOpControl, start);
   Node* success = graph()->NewNode(common.IfSuccess(), node);
   Node* exception = graph()->NewNode(common.IfException(kNoHint), effect, node);
   Node* use_control = graph()->NewNode(common.Merge(1), success);
+  Node* use_exception_control = graph()->NewNode(common.Merge(1), exception);
   Node* replacement = graph()->NewNode(&kMockOperator);
-  GraphReducer graph_reducer(zone(), graph(), dead);
+  GraphReducer graph_reducer(zone(), graph(), nullptr, dead);
   ReplaceWithValueReducer r(&graph_reducer);
   r.ReplaceWithValue(node, replacement);
   EXPECT_EQ(start, use_control->InputAt(0));
-  EXPECT_EQ(dead, exception->InputAt(1));
+  EXPECT_EQ(dead, use_exception_control->InputAt(0));
   EXPECT_EQ(0, node->UseCount());
   EXPECT_EQ(2, start->UseCount());
   EXPECT_EQ(1, dead->UseCount());
   EXPECT_EQ(0, replacement->UseCount());
   EXPECT_THAT(start->uses(), UnorderedElementsAre(use_control, node));
-  EXPECT_THAT(dead->uses(), ElementsAre(exception));
+  EXPECT_THAT(dead->uses(), ElementsAre(use_exception_control));
 }
 
 
 TEST_F(AdvancedReducerTest, ReplaceWithValue_ControlUse3) {
   CommonOperatorBuilder common(zone());
   Node* start = graph()->NewNode(common.Start(1));
   Node* effect = graph()->NewNode(&kMockOperator);
   Node* dead = graph()->NewNode(&kMockOperator);
   Node* node = graph()->NewNode(&kMockOpControl, start);
   Node* success = graph()->NewNode(common.IfSuccess(), node);
   Node* exception = graph()->NewNode(common.IfException(kNoHint), effect, node);
   Node* use_control = graph()->NewNode(common.Merge(1), success);
+  Node* use_exception_value = graph()->NewNode(common.Return(), exception);
   Node* replacement = graph()->NewNode(&kMockOperator);
-  GraphReducer graph_reducer(zone(), graph(), dead);
+  GraphReducer graph_reducer(zone(), graph(), dead, nullptr);
   ReplaceWithValueReducer r(&graph_reducer);
   r.ReplaceWithValue(node, replacement);
   EXPECT_EQ(start, use_control->InputAt(0));
-  EXPECT_EQ(dead, exception->InputAt(1));
+  EXPECT_EQ(dead, use_exception_value->InputAt(0));
   EXPECT_EQ(0, node->UseCount());
   EXPECT_EQ(2, start->UseCount());
   EXPECT_EQ(1, dead->UseCount());
   EXPECT_EQ(0, replacement->UseCount());
   EXPECT_THAT(start->uses(), UnorderedElementsAre(use_control, node));
-  EXPECT_THAT(dead->uses(), ElementsAre(exception));
+  EXPECT_THAT(dead->uses(), ElementsAre(use_exception_value));
 }
 
 
 class GraphReducerTest : public TestWithZone {
  public:
   GraphReducerTest() : graph_(zone()) {}
 
   static void SetUpTestCase() {
     TestWithZone::SetUpTestCase();
     DefaultValue<Reduction>::Set(Reducer::NoChange());
@@ skipping 453 matching lines @@
       EXPECT_EQ(&kOpC0, n1->op());
       EXPECT_EQ(&kOpC1, end->op());
       EXPECT_EQ(n1, end->InputAt(0));
     }
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8