[turbofan] Pull ResizeMergeOrPhi into CommonOperatorBuilder and use in ControlReducer.

src/compiler/loop-peeling.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/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/loop-peeling.h"
 #include "src/compiler/node.h"
 #include "src/compiler/node-marker.h"
 #include "src/compiler/node-properties-inl.h"
@@ skipping 143 matching lines @@
   // TODO(turbofan): we use a simple linear search, since the peeled iteration
   // is really only used in testing.
   PeeledIterationImpl* impl = static_cast<PeeledIterationImpl*>(this);
   for (size_t i = 0; i < impl->node_pairs_.size(); i += 2) {
     if (impl->node_pairs_[i] == node) return impl->node_pairs_[i + 1];
   }
   return node;
 }
 
 
-static const Operator* ResizeMergeOrPhi(CommonOperatorBuilder* common,
-                                        const Operator* op, int size) {
-  if (op->opcode() == IrOpcode::kPhi) {
-    return common->Phi(OpParameter<MachineType>(op), size);
-  } else if (op->opcode() == IrOpcode::kEffectPhi) {
-    return common->EffectPhi(size);
-  } else if (op->opcode() == IrOpcode::kMerge) {
-    return common->Merge(size);
-  } else if (op->opcode() == IrOpcode::kLoop) {
-    return common->Loop(size);
-  } else {
-    UNREACHABLE();
-    return nullptr;
-  }
-}
-
-
 PeeledIteration* LoopPeeler::Peel(Graph* graph, CommonOperatorBuilder* common,
                                   LoopTree* loop_tree, LoopTree::Loop* loop,
                                   Zone* tmp_zone) {
   PeeledIterationImpl* iter = new (tmp_zone) PeeledIterationImpl(tmp_zone);
   Peeling peeling(graph, tmp_zone, loop->TotalSize() * 2 + 2,
                   &iter->node_pairs_);
 
   //============================================================================
   // Construct the peeled iteration.
   //============================================================================
@@ skipping 27 matching lines @@
     // Merge values from the multiple output edges of the peeled iteration.
     for (Node* node : loop_tree->HeaderNodes(loop)) {
       if (node->opcode() == IrOpcode::kLoop) continue;  // already done.
       inputs.clear();
       for (int i = 0; i < backedges; i++) {
         inputs.push_back(peeling.map(node->InputAt(1 + i)));
       }
       for (Node* input : inputs) {
         if (input != inputs[0]) {  // Non-redundant phi.
           inputs.push_back(merge);
-          const Operator* op = ResizeMergeOrPhi(common, node->op(), backedges);
+          const Operator* op = common->ResizeMergeOrPhi(node->op(), backedges);
           Node* phi = graph->NewNode(op, backedges + 1, &inputs[0]);
           node->ReplaceInput(0, phi);
           break;
         }
       }
     }
     new_entry = merge;
   } else {
     // Only one backedge, simply replace the input to loop with output of
     // peeling.
@@ skipping 108 matching lines @@
       }
     }
   }
 
   return iter;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8