[turbofan] Refactor escape analysis to only expose one class.

test/unittests/compiler/escape-analysis-unittest.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/bit-vector.h"
 #include "src/compiler/escape-analysis.h"
 #include "src/compiler/escape-analysis-reducer.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/types-inl.h"
 #include "src/zone-containers.h"
 #include "test/unittests/compiler/graph-unittest.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class EscapeAnalysisTest : public GraphTest {
  public:
   EscapeAnalysisTest()
       : simplified_(zone()),
         jsgraph_(isolate(), graph(), common(), nullptr, nullptr, nullptr),
-        escape_objects_(graph(), common(), zone()),
-        escape_status_(&escape_objects_, graph(), zone()),
+        escape_analysis_(graph(), common(), zone()),
         effect_(graph()->start()),
         control_(graph()->start()) {}
 
   ~EscapeAnalysisTest() {}
 
-  EscapeStatusAnalysis* escape_status() { return &escape_status_; }
-  EscapeObjectAnalysis* escape_objects() { return &escape_objects_; }
+  EscapeAnalysis* escape_analysis() { return &escape_analysis_; }
 
  protected:
-  void Analysis() {
-    escape_objects_.Run();
-    escape_status_.Run();
-  }
+  void Analysis() { escape_analysis_.Run(); }
 
   void Transformation() {
     GraphReducer graph_reducer(zone(), graph());
-    EscapeAnalysisReducer escape_reducer(
-        &graph_reducer, &jsgraph_, &escape_status_, &escape_objects_, zone());
+    EscapeAnalysisReducer escape_reducer(&graph_reducer, &jsgraph_,
+                                         &escape_analysis_, zone());
     graph_reducer.AddReducer(&escape_reducer);
     graph_reducer.ReduceGraph();
   }
 
   // ---------------------------------Node Creation Helper----------------------
 
   Node* BeginRegion(Node* effect = nullptr) {
     if (!effect) {
       effect = effect_;
     }
@@ skipping 83 matching lines @@
 
   FieldAccess AccessAtIndex(int offset) {
     FieldAccess access = {kTaggedBase, offset, MaybeHandle<Name>(), Type::Any(),
                           kMachAnyTagged};
     return access;
   }
 
   // ---------------------------------Assertion Helper--------------------------
 
   void ExpectReplacement(Node* node, Node* rep) {
-    EXPECT_EQ(rep, escape_objects()->GetReplacement(node, node->id()));
+    EXPECT_EQ(rep, escape_analysis()->GetReplacement(node, node->id()));
   }
 
   void ExpectReplacementPhi(Node* node, Node* left, Node* right) {
-    Node* rep = escape_objects()->GetReplacement(node, node->id());
+    Node* rep = escape_analysis()->GetReplacement(node, node->id());
     ASSERT_NE(nullptr, rep);
     ASSERT_EQ(IrOpcode::kPhi, rep->opcode());
     EXPECT_EQ(left, NodeProperties::GetValueInput(rep, 0));
     EXPECT_EQ(right, NodeProperties::GetValueInput(rep, 1));
   }
 
   void ExpectVirtual(Node* node) {
     EXPECT_TRUE(node->opcode() == IrOpcode::kAllocate ||
                 node->opcode() == IrOpcode::kFinishRegion);
-    EXPECT_TRUE(escape_status()->IsVirtual(node));
+    EXPECT_TRUE(escape_analysis()->IsVirtual(node));
   }
 
   void ExpectEscaped(Node* node) {
     EXPECT_TRUE(node->opcode() == IrOpcode::kAllocate ||
                 node->opcode() == IrOpcode::kFinishRegion);
-    EXPECT_TRUE(escape_status()->IsEscaped(node));
+    EXPECT_TRUE(escape_analysis()->IsEscaped(node));
   }
 
   SimplifiedOperatorBuilder* simplified() { return &simplified_; }
 
   Node* effect() { return effect_; }
 
  private:
   SimplifiedOperatorBuilder simplified_;
   JSGraph jsgraph_;
-  EscapeObjectAnalysis escape_objects_;
-  EscapeStatusAnalysis escape_status_;
+  EscapeAnalysis escape_analysis_;
 
   Node* effect_;
   Node* control_;
 };
 
 
 // -----------------------------------------------------------------------------
 // Test cases.
 
 
@@ skipping 79 matching lines @@
   Node* effect2 = Store(AccessAtIndex(0), allocation, object2, finish, ifTrue);
   Node* merge = Merge2(ifFalse, ifTrue);
   Node* phi = graph()->NewNode(common()->EffectPhi(2), effect1, effect2, merge);
   Node* load = Load(AccessAtIndex(0), finish, phi, merge);
   Node* result = Return(load, phi);
   EndGraph();
   Analysis();
 
   ExpectVirtual(allocation);
   ExpectReplacementPhi(load, object1, object2);
-  Node* replacement_phi = escape_objects()->GetReplacement(load, load->id());
+  Node* replacement_phi = escape_analysis()->GetReplacement(load, load->id());
 
   Transformation();
 
   ASSERT_EQ(replacement_phi, NodeProperties::GetValueInput(result, 0));
 }
 
 
 TEST_F(EscapeAnalysisTest, DanglingLoadOrder) {
   Node* object1 = Constant(1);
   Node* object2 = Constant(2);
@@ skipping 12 matching lines @@
   ExpectReplacement(load2, object1);
 
   Transformation();
 
   ASSERT_EQ(object1, NodeProperties::GetValueInput(result, 0));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8