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

src/compiler/escape-analysis-reducer.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/escape-analysis-reducer.h"
 
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-EscapeAnalysisReducer::EscapeAnalysisReducer(
-    Editor* editor, JSGraph* jsgraph, EscapeStatusAnalysis* escape_status,
-    EscapeObjectAnalysis* escape_analysis, Zone* zone)
+EscapeAnalysisReducer::EscapeAnalysisReducer(Editor* editor, JSGraph* jsgraph,
+                                             EscapeAnalysis* escape_analysis,
+                                             Zone* zone)
     : AdvancedReducer(editor),
       jsgraph_(jsgraph),
-      escape_status_(escape_status),
       escape_analysis_(escape_analysis),
       zone_(zone) {}
 
 
 Reduction EscapeAnalysisReducer::Reduce(Node* node) {
   switch (node->opcode()) {
     case IrOpcode::kLoadField:
       return ReduceLoadField(node);
     case IrOpcode::kStoreField:
       return ReduceStoreField(node);
@@ skipping 21 matching lines @@
     }
     ReplaceWithValue(node, rep);
     return Changed(rep);
   }
   return NoChange();
 }
 
 
 Reduction EscapeAnalysisReducer::ReduceStoreField(Node* node) {
   DCHECK_EQ(node->opcode(), IrOpcode::kStoreField);
-  if (escape_status()->IsVirtual(NodeProperties::GetValueInput(node, 0))) {
+  if (escape_analysis()->IsVirtual(NodeProperties::GetValueInput(node, 0))) {
     if (FLAG_trace_turbo_escape) {
       PrintF("Removed store field #%d from effect chain\n", node->id());
     }
     RelaxEffectsAndControls(node);
     return Changed(node);
   }
   return NoChange();
 }
 
 
 Reduction EscapeAnalysisReducer::ReduceAllocate(Node* node) {
   DCHECK_EQ(node->opcode(), IrOpcode::kAllocate);
-  if (escape_status()->IsVirtual(node)) {
+  if (escape_analysis()->IsVirtual(node)) {
     RelaxEffectsAndControls(node);
     if (FLAG_trace_turbo_escape) {
       PrintF("Removed allocate #%d from effect chain\n", node->id());
     }
     return Changed(node);
   }
   return NoChange();
 }
 
 
@@ skipping 15 matching lines @@
     return Changed(node);
   }
   return NoChange();
 }
 
 
 Reduction EscapeAnalysisReducer::ReduceReferenceEqual(Node* node) {
   DCHECK_EQ(node->opcode(), IrOpcode::kReferenceEqual);
   Node* left = NodeProperties::GetValueInput(node, 0);
   Node* right = NodeProperties::GetValueInput(node, 1);
-  if (escape_status()->IsVirtual(left)) {
-    if (escape_status()->IsVirtual(right)) {
+  if (escape_analysis()->IsVirtual(left)) {
+    if (escape_analysis()->IsVirtual(right)) {
       if (Node* rep = escape_analysis()->GetReplacement(node, left->id())) {
         left = rep;
       }
       if (Node* rep = escape_analysis()->GetReplacement(node, right->id())) {
         right = rep;
       }
       // TODO(sigurds): What to do if either is a PHI?
       if (left == right) {
         ReplaceWithValue(node, jsgraph()->TrueConstant());
         if (FLAG_trace_turbo_escape) {
           PrintF("Replaced ref eq #%d with true\n", node->id());
         }
         return Replace(node);
       }
     }
     // Right-hand side is either not virtual, or a different node.
     ReplaceWithValue(node, jsgraph()->FalseConstant());
     if (FLAG_trace_turbo_escape) {
       PrintF("Replaced ref eq #%d with false\n", node->id());
     }
     return Replace(node);
-  } else if (escape_status()->IsVirtual(right)) {
+  } else if (escape_analysis()->IsVirtual(right)) {
     // Left-hand side is not a virtual object.
     ReplaceWithValue(node, jsgraph()->FalseConstant());
     if (FLAG_trace_turbo_escape) {
       PrintF("Replaced ref eq #%d with false\n", node->id());
     }
   }
   return NoChange();
 }
 
 
 // TODO(sigurds): This is a temporary solution until escape analysis
 // supports deoptimization.
 Reduction EscapeAnalysisReducer::ReplaceWithDeoptDummy(Node* node) {
   DCHECK(node->opcode() == IrOpcode::kStateValues ||
          node->opcode() == IrOpcode::kFrameState);
   Reduction r = NoChange();
   for (int i = 0; i < node->op()->ValueInputCount(); ++i) {
     Node* input = NodeProperties::GetValueInput(node, i);
     if (input->opcode() == IrOpcode::kFinishRegion ||
         input->opcode() == IrOpcode::kAllocate ||
         input->opcode() == IrOpcode::kPhi) {
-      if (escape_status()->IsVirtual(input)) {
+      if (escape_analysis()->IsVirtual(input)) {
         NodeProperties::ReplaceValueInput(node, jsgraph()->UndefinedConstant(),
                                           i);
         if (FLAG_trace_turbo_escape) {
           PrintF("Replaced state value (#%d) input with dummy\n", node->id());
         }
         r = Changed(node);
       }
     }
   }
   return r;
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8