Changed the constructor of BufferedRawMachineAssemblerTester.

test/cctest/compiler/codegen-tester.h

 // 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.
 
 #ifndef V8_CCTEST_COMPILER_CODEGEN_TESTER_H_
 #define V8_CCTEST_COMPILER_CODEGEN_TESTER_H_
 
 #include "src/compiler/instruction-selector.h"
 #include "src/compiler/pipeline.h"
 #include "src/compiler/raw-machine-assembler.h"
@@ skipping 59 matching lines @@
 
  private:
   MaybeHandle<Code> code_;
 };
 
 
 template <typename ReturnType>
 class BufferedRawMachineAssemblerTester
     : public RawMachineAssemblerTester<int32_t> {
  public:
-  BufferedRawMachineAssemblerTester()
-      : BufferedRawMachineAssemblerTester(0, kMachNone, kMachNone, kMachNone,
-                                          kMachNone) {}
-
-
-  explicit BufferedRawMachineAssemblerTester(MachineType p0)
-      : BufferedRawMachineAssemblerTester(1, p0, kMachNone, kMachNone,
-                                          kMachNone) {}
-
-
-  BufferedRawMachineAssemblerTester(MachineType p0, MachineType p1)
-      : BufferedRawMachineAssemblerTester(2, p0, p1, kMachNone, kMachNone) {}
-
-
-  BufferedRawMachineAssemblerTester(MachineType p0, MachineType p1,
-                                    MachineType p2)
-      : BufferedRawMachineAssemblerTester(3, p0, p1, p2, kMachNone) {}
-
-
-  BufferedRawMachineAssemblerTester(MachineType p0, MachineType p1,
-                                    MachineType p2, MachineType p3)
-      : BufferedRawMachineAssemblerTester(4, p0, p1, p2, p3) {}
+  BufferedRawMachineAssemblerTester(MachineType p0 = kMachNone,
+                                    MachineType p1 = kMachNone,
+                                    MachineType p2 = kMachNone,
+                                    MachineType p3 = kMachNone)
+      : BufferedRawMachineAssemblerTester(DetermineReturnIndex(p0, p1, p2, p3),
+                                          p0, p1, p2, p3) {}
 
 
   // The BufferedRawMachineAssemblerTester does not pass parameters directly
   // to the constructed IR graph. Instead it passes a pointer to the parameter
   // to the IR graph, and adds Load nodes to the IR graph to load the
   // parameters from memory. Thereby it is possible to pass 64 bit parameters
   // to the IR graph.
   Node* Parameter(size_t index) {
     CHECK(index >= 0 && index < 4);
     return parameter_nodes_[index];
@@ skipping 74 matching lines @@
         p0 == kMachNone ? nullptr : Load(p0, RawMachineAssembler::Parameter(0));
     parameter_nodes_[1] =
         p1 == kMachNone ? nullptr : Load(p1, RawMachineAssembler::Parameter(1));
     parameter_nodes_[2] =
         p2 == kMachNone ? nullptr : Load(p2, RawMachineAssembler::Parameter(2));
     parameter_nodes_[3] =
         p3 == kMachNone ? nullptr : Load(p3, RawMachineAssembler::Parameter(3));
   }
 
 
+  static uint32_t DetermineReturnIndex(MachineType p0, MachineType p1,

[titzer, 2015/11/05 17:39:42]

I think this should be called ComputeParameterCount().

Otherwise lgtm

+                                       MachineType p2, MachineType p3) {
+    if (p0 == kMachNone) {
+      return 0;
+    }
+    if (p1 == kMachNone) {
+      return 1;
+    }
+    if (p2 == kMachNone) {
+      return 2;
+    }
+    if (p3 == kMachNone) {
+      return 3;
+    }
+    return 4;
+  }
+
+
   CSignature* test_graph_signature_;
   Node* parameter_nodes_[4];
   uint32_t return_parameter_index_;
 };
 
 
 template <>
 class BufferedRawMachineAssemblerTester<void>
     : public RawMachineAssemblerTester<void> {
  public:
@@ skipping 314 matching lines @@
   } else {
     CHECK_EQ(x, y);
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CCTEST_COMPILER_CODEGEN_TESTER_H_