[wasm] Remove the explicit count from WASM_BLOCK and WASM_LOOP macros.

test/unittests/wasm/loop-assignment-analysis-unittest.cc

 // Copyright 2016 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 "test/unittests/test-utils.h"
 
 #include "src/v8.h"
 
 #include "test/cctest/wasm/test-signatures.h"
 
@@ skipping 34 matching lines @@
     for (int j = 0; j < assigned->length(); j++) {
       CHECK_EQ(false, assigned->Contains(j));
     }
     num_locals++;
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, One) {
   num_locals = 5;
   for (int i = 0; i < 5; i++) {
-    byte code[] = {WASM_LOOP(1, WASM_SET_ZERO(i))};
+    byte code[] = {WASM_LOOP(WASM_SET_ZERO(i))};
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
       CHECK_EQ(j == i, assigned->Contains(j));
     }
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, OneBeyond) {
   num_locals = 5;
   for (int i = 0; i < 5; i++) {
-    byte code[] = {WASM_LOOP(1, WASM_SET_ZERO(i)), WASM_SET_ZERO(1)};
+    byte code[] = {WASM_LOOP(WASM_SET_ZERO(i)), WASM_SET_ZERO(1)};
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
       CHECK_EQ(j == i, assigned->Contains(j));
     }
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, Two) {
   num_locals = 5;
   for (int i = 0; i < 5; i++) {
     for (int j = 0; j < 5; j++) {
-      byte code[] = {WASM_LOOP(2, WASM_SET_ZERO(i), WASM_SET_ZERO(j))};
+      byte code[] = {WASM_LOOP(WASM_SET_ZERO(i), WASM_SET_ZERO(j))};
       BitVector* assigned = Analyze(code, code + arraysize(code));
       for (int k = 0; k < assigned->length(); k++) {
         bool expected = k == i || k == j;
         CHECK_EQ(expected, assigned->Contains(k));
       }
     }
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, NestedIf) {
   num_locals = 5;
   for (int i = 0; i < 5; i++) {
     byte code[] = {WASM_LOOP(
-        1, WASM_IF_ELSE(WASM_SET_ZERO(0), WASM_SET_ZERO(i), WASM_SET_ZERO(1)))};
+        WASM_IF_ELSE(WASM_SET_ZERO(0), WASM_SET_ZERO(i), WASM_SET_ZERO(1)))};
     BitVector* assigned = Analyze(code, code + arraysize(code));
     for (int j = 0; j < assigned->length(); j++) {
       bool expected = i == j || j == 0 || j == 1;
       CHECK_EQ(expected, assigned->Contains(j));
     }
   }
 }
 
 static byte LEBByte(uint32_t val, byte which) {
   byte b = (val >> (which * 7)) & 0x7F;
@@ skipping 18 matching lines @@
     for (int j = 0; j < assigned->length(); j++) {
       bool expected = i == j;
       CHECK_EQ(expected, assigned->Contains(j));
     }
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, Break) {
   num_locals = 3;
   byte code[] = {
-      WASM_LOOP(1, WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_SET_ZERO(1)))),
+      WASM_LOOP(WASM_IF(WASM_GET_LOCAL(0), WASM_BRV(1, WASM_SET_ZERO(1)))),
       WASM_SET_ZERO(0)};
 
   BitVector* assigned = Analyze(code, code + arraysize(code));
   for (int j = 0; j < assigned->length(); j++) {
     bool expected = j == 1;
     CHECK_EQ(expected, assigned->Contains(j));
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, Loop1) {
   num_locals = 5;
   byte code[] = {
-      WASM_LOOP(1, WASM_IF(WASM_GET_LOCAL(0),
-                           WASM_BRV(0, WASM_SET_LOCAL(
-                                           3, WASM_I32_SUB(WASM_GET_LOCAL(0),
-                                                           WASM_I8(1)))))),
+      WASM_LOOP(WASM_IF(
+          WASM_GET_LOCAL(0),
+          WASM_BRV(0, WASM_SET_LOCAL(
+                          3, WASM_I32_SUB(WASM_GET_LOCAL(0), WASM_I8(1)))))),
       WASM_GET_LOCAL(0)};
 
   BitVector* assigned = Analyze(code, code + arraysize(code));
   for (int j = 0; j < assigned->length(); j++) {
     bool expected = j == 3;
     CHECK_EQ(expected, assigned->Contains(j));
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, Loop2) {
   num_locals = 6;
   const byte kIter = 0;
   const byte kSum = 3;
 
   byte code[] = {WASM_BLOCK(
-      3,
       WASM_WHILE(
           WASM_GET_LOCAL(kIter),
-          WASM_BLOCK(2, WASM_SET_LOCAL(
-                            kSum, WASM_F32_ADD(
-                                      WASM_GET_LOCAL(kSum),
-                                      WASM_LOAD_MEM(MachineType::Float32(),
-                                                    WASM_GET_LOCAL(kIter)))),
-                     WASM_SET_LOCAL(kIter, WASM_I32_SUB(WASM_GET_LOCAL(kIter),
-                                                        WASM_I8(4))))),
+          WASM_BLOCK(
+              WASM_SET_LOCAL(
+                  kSum, WASM_F32_ADD(WASM_GET_LOCAL(kSum),
+                                     WASM_LOAD_MEM(MachineType::Float32(),
+                                                   WASM_GET_LOCAL(kIter)))),
+              WASM_SET_LOCAL(kIter,
+                             WASM_I32_SUB(WASM_GET_LOCAL(kIter), WASM_I8(4))))),
       WASM_STORE_MEM(MachineType::Float32(), WASM_ZERO, WASM_GET_LOCAL(kSum)),
       WASM_GET_LOCAL(kIter))};
 
   BitVector* assigned = Analyze(code + 1, code + arraysize(code));
   for (int j = 0; j < assigned->length(); j++) {
     bool expected = j == kIter || j == kSum;
     CHECK_EQ(expected, assigned->Contains(j));
   }
 }
 
 TEST_F(WasmLoopAssignmentAnalyzerTest, Malformed) {
   byte code[] = {kExprLoop, kExprF32Neg, kExprBrTable, 0x0e, 'h', 'e',
                  'l',       'l',         'o',          ',',  ' ', 'w',
                  'o',       'r',         'l',          'd',  '!'};
   BitVector* assigned = Analyze(code, code + arraysize(code));
   CHECK_NULL(assigned);
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8