[turbofan] Fix MachineOperatorReducer to use JSGraph as well.

src/compiler/machine-operator-reducer.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/machine-operator-reducer.h"
 
 #include "src/base/bits.h"
-#include "src/compiler/common-node-cache.h"
 #include "src/compiler/generic-node-inl.h"
 #include "src/compiler/graph.h"
+#include "src/compiler/js-graph.h"
 #include "src/compiler/node-matchers.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-MachineOperatorReducer::MachineOperatorReducer(Graph* graph)
-    : graph_(graph),
-      cache_(new (graph->zone()) CommonNodeCache(graph->zone())),
-      common_(graph->zone()),
-      machine_(graph->zone()) {}
+MachineOperatorReducer::MachineOperatorReducer(JSGraph* jsgraph)
+    : jsgraph_(jsgraph), machine_(jsgraph->zone()) {}
 
 
-MachineOperatorReducer::MachineOperatorReducer(Graph* graph,
-                                               CommonNodeCache* cache)
-    : graph_(graph),
-      cache_(cache),
-      common_(graph->zone()),
-      machine_(graph->zone()) {}
+MachineOperatorReducer::~MachineOperatorReducer() {}
 
 
 Node* MachineOperatorReducer::Float64Constant(volatile double value) {
-  Node** loc = cache_->FindFloat64Constant(value);
-  if (*loc == NULL) {
-    *loc = graph_->NewNode(common_.Float64Constant(value));
-  }
-  return *loc;
+  return jsgraph()->Float64Constant(value);
 }
 
 
 Node* MachineOperatorReducer::Int32Constant(int32_t value) {
-  Node** loc = cache_->FindInt32Constant(value);
-  if (*loc == NULL) {
-    *loc = graph_->NewNode(common_.Int32Constant(value));
-  }
-  return *loc;
+  return jsgraph()->Int32Constant(value);
 }
 
 
 Node* MachineOperatorReducer::Int64Constant(int64_t value) {
-  return graph_->NewNode(common_.Int64Constant(value));
+  return graph()->NewNode(common()->Int64Constant(value));
 }
 
 
 // Perform constant folding and strength reduction on machine operators.
 Reduction MachineOperatorReducer::Reduce(Node* node) {
   switch (node->opcode()) {
     case IrOpcode::kWord32And: {
       Int32BinopMatcher m(node);
       if (m.right().Is(0)) return Replace(m.right().node());  // x & 0  => 0
       if (m.right().Is(-1)) return Replace(m.left().node());  // x & -1 => x
@@ skipping 13 matching lines @@
       if (m.LeftEqualsRight()) return Replace(m.left().node());  // x | x => x
       if (m.left().IsWord32Shl() && m.right().IsWord32Shr()) {
         Int32BinopMatcher mleft(m.left().node());
         Int32BinopMatcher mright(m.right().node());
         if (mleft.left().node() == mright.left().node()) {
           // (x << y) | (x >> (32 - y)) => x ror y
           if (mright.right().IsInt32Sub()) {
             Int32BinopMatcher mrightright(mright.right().node());
             if (mrightright.left().Is(32) &&
                 mrightright.right().node() == mleft.right().node()) {
-              graph_->ChangeOperator(node, machine_.Word32Ror());
+              graph()->ChangeOperator(node, machine()->Word32Ror());
               node->ReplaceInput(0, mleft.left().node());
               node->ReplaceInput(1, mleft.right().node());
               return Changed(node);
             }
           }
           // (x << K) | (x >> (32 - K)) => x ror K
           if (mleft.right().IsInRange(0, 31) &&
               mright.right().Is(32 - mleft.right().Value())) {
-            graph_->ChangeOperator(node, machine_.Word32Ror());
+            graph()->ChangeOperator(node, machine()->Word32Ror());
             node->ReplaceInput(0, mleft.left().node());
             node->ReplaceInput(1, mleft.right().node());
             return Changed(node);
           }
         }
       }
       if (m.left().IsWord32Shr() && m.right().IsWord32Shl()) {
         // (x >> (32 - y)) | (x << y)  => x ror y
         Int32BinopMatcher mleft(m.left().node());
         Int32BinopMatcher mright(m.right().node());
         if (mleft.left().node() == mright.left().node()) {
           if (mleft.right().IsInt32Sub()) {
             Int32BinopMatcher mleftright(mleft.right().node());
             if (mleftright.left().Is(32) &&
                 mleftright.right().node() == mright.right().node()) {
-              graph_->ChangeOperator(node, machine_.Word32Ror());
+              graph()->ChangeOperator(node, machine()->Word32Ror());
               node->ReplaceInput(0, mright.left().node());
               node->ReplaceInput(1, mright.right().node());
               return Changed(node);
             }
           }
           // (x >> (32 - K)) | (x << K) => x ror K
           if (mright.right().IsInRange(0, 31) &&
               mleft.right().Is(32 - mright.right().Value())) {
-            graph_->ChangeOperator(node, machine_.Word32Ror());
+            graph()->ChangeOperator(node, machine()->Word32Ror());
             node->ReplaceInput(0, mright.left().node());
             node->ReplaceInput(1, mright.right().node());
             return Changed(node);
           }
         }
       }
       break;
     }
     case IrOpcode::kWord32Xor: {
       Int32BinopMatcher m(node);
@@ skipping 72 matching lines @@
       break;
     }
     case IrOpcode::kInt32Mul: {
       Int32BinopMatcher m(node);
       if (m.right().Is(0)) return Replace(m.right().node());  // x * 0 => 0
       if (m.right().Is(1)) return Replace(m.left().node());   // x * 1 => x
       if (m.IsFoldable()) {                                   // K * K => K
         return ReplaceInt32(m.left().Value() * m.right().Value());
       }
       if (m.right().Is(-1)) {  // x * -1 => 0 - x
-        graph_->ChangeOperator(node, machine_.Int32Sub());
+        graph()->ChangeOperator(node, machine()->Int32Sub());
         node->ReplaceInput(0, Int32Constant(0));
         node->ReplaceInput(1, m.left().node());
         return Changed(node);
       }
       if (m.right().IsPowerOf2()) {  // x * 2^n => x << n
-        graph_->ChangeOperator(node, machine_.Word32Shl());
+        graph()->ChangeOperator(node, machine()->Word32Shl());
         node->ReplaceInput(1, Int32Constant(WhichPowerOf2(m.right().Value())));
         return Changed(node);
       }
       break;
     }
     case IrOpcode::kInt32Div: {
       Int32BinopMatcher m(node);
       if (m.right().Is(1)) return Replace(m.left().node());  // x / 1 => x
       // TODO(turbofan): if (m.left().Is(0))
       // TODO(turbofan): if (m.right().IsPowerOf2())
       // TODO(turbofan): if (m.right().Is(0))
       // TODO(turbofan): if (m.LeftEqualsRight())
       if (m.IsFoldable() && !m.right().Is(0)) {  // K / K => K
         if (m.right().Is(-1)) return ReplaceInt32(-m.left().Value());
         return ReplaceInt32(m.left().Value() / m.right().Value());
       }
       if (m.right().Is(-1)) {  // x / -1 => 0 - x
-        graph_->ChangeOperator(node, machine_.Int32Sub());
+        graph()->ChangeOperator(node, machine()->Int32Sub());
         node->ReplaceInput(0, Int32Constant(0));
         node->ReplaceInput(1, m.left().node());
         return Changed(node);
       }
       break;
     }
     case IrOpcode::kInt32UDiv: {
       Uint32BinopMatcher m(node);
       if (m.right().Is(1)) return Replace(m.left().node());  // x / 1 => x
       // TODO(turbofan): if (m.left().Is(0))
       // TODO(turbofan): if (m.right().Is(0))
       // TODO(turbofan): if (m.LeftEqualsRight())
       if (m.IsFoldable() && !m.right().Is(0)) {  // K / K => K
         return ReplaceInt32(m.left().Value() / m.right().Value());
       }
       if (m.right().IsPowerOf2()) {  // x / 2^n => x >> n
-        graph_->ChangeOperator(node, machine_.Word32Shr());
+        graph()->ChangeOperator(node, machine()->Word32Shr());
         node->ReplaceInput(1, Int32Constant(WhichPowerOf2(m.right().Value())));
         return Changed(node);
       }
       break;
     }
     case IrOpcode::kInt32Mod: {
       Int32BinopMatcher m(node);
       if (m.right().Is(1)) return ReplaceInt32(0);   // x % 1  => 0
       if (m.right().Is(-1)) return ReplaceInt32(0);  // x % -1 => 0
       // TODO(turbofan): if (m.left().Is(0))
       // TODO(turbofan): if (m.right().IsPowerOf2())
       // TODO(turbofan): if (m.right().Is(0))
       // TODO(turbofan): if (m.LeftEqualsRight())
       if (m.IsFoldable() && !m.right().Is(0)) {  // K % K => K
         return ReplaceInt32(m.left().Value() % m.right().Value());
       }
       break;
     }
     case IrOpcode::kInt32UMod: {
       Uint32BinopMatcher m(node);
       if (m.right().Is(1)) return ReplaceInt32(0);  // x % 1 => 0
       // TODO(turbofan): if (m.left().Is(0))
       // TODO(turbofan): if (m.right().Is(0))
       // TODO(turbofan): if (m.LeftEqualsRight())
       if (m.IsFoldable() && !m.right().Is(0)) {  // K % K => K
         return ReplaceInt32(m.left().Value() % m.right().Value());
       }
       if (m.right().IsPowerOf2()) {  // x % 2^n => x & 2^n-1
-        graph_->ChangeOperator(node, machine_.Word32And());
+        graph()->ChangeOperator(node, machine()->Word32And());
         node->ReplaceInput(1, Int32Constant(m.right().Value() - 1));
         return Changed(node);
       }
       break;
     }
     case IrOpcode::kInt32LessThan: {
       Int32BinopMatcher m(node);
       if (m.IsFoldable()) {  // K < K => K
         return ReplaceBool(m.left().Value() < m.right().Value());
       }
@@ skipping 147 matching lines @@
       if (m.HasValue()) return ReplaceInt32(static_cast<int32_t>(m.Value()));
       if (m.IsChangeInt32ToInt64()) return Replace(m.node()->InputAt(0));
       break;
     }
     // TODO(turbofan): strength-reduce and fold floating point operations.
     default:
       break;
   }
   return NoChange();
 }
+
+
+CommonOperatorBuilder* MachineOperatorReducer::common() const {
+  return jsgraph()->common();
 }
-}
-}  // namespace v8::internal::compiler
+
+
+Graph* MachineOperatorReducer::graph() const { return jsgraph()->graph(); }
+
+}  // namespace compiler
+}  // namespace internal
+}  // namespace v8