[wasm] Remove the module environment and signature as arguments to OpcodeArity.

test/unittests/wasm/ast-decoder-unittest.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 "test/unittests/test-utils.h"
 
 #include "src/v8.h"
 
 #include "test/cctest/wasm/test-signatures.h"
 
@@ skipping 2031 matching lines @@
   EXPECT_LENGTH(1, kExprF64ConvertF32);
   EXPECT_LENGTH(1, kExprF64ReinterpretI64);
   EXPECT_LENGTH(1, kExprI32ReinterpretF32);
   EXPECT_LENGTH(1, kExprI64ReinterpretF64);
 }
 
 
 class WasmOpcodeArityTest : public TestWithZone {
  public:
   WasmOpcodeArityTest() : TestWithZone() {}
-  TestModuleEnv module;
-  TestSignatures sigs;
 };
 
-#define EXPECT_ARITY(expected, ...)                                            \
-  {                                                                            \
-    static const byte code[] = {__VA_ARGS__};                                  \
-    EXPECT_EQ(expected, OpcodeArity(&module, sig, code, code + sizeof(code))); \
+#define EXPECT_ARITY(expected, ...)                              \
+  {                                                              \
+    static const byte code[] = {__VA_ARGS__};                    \
+    EXPECT_EQ(expected, OpcodeArity(code, code + sizeof(code))); \
   }
 
 TEST_F(WasmOpcodeArityTest, Control) {
-  FunctionSig* sig = sigs.v_v();
   EXPECT_ARITY(0, kExprNop);
 
   EXPECT_ARITY(0, kExprBlock, 0);
   EXPECT_ARITY(0, kExprBlock, 1);
   EXPECT_ARITY(0, kExprBlock, 2);
   EXPECT_ARITY(0, kExprBlock, 5);
   EXPECT_ARITY(0, kExprBlock, 10);
 
   EXPECT_ARITY(0, kExprLoop, 0);
   EXPECT_ARITY(0, kExprLoop, 1);
   EXPECT_ARITY(0, kExprLoop, 2);
   EXPECT_ARITY(0, kExprLoop, 7);
   EXPECT_ARITY(0, kExprLoop, 11);
 
   EXPECT_ARITY(3, kExprSelect);
 
   EXPECT_ARITY(0, kExprBr);
   EXPECT_ARITY(1, kExprBrIf);
   EXPECT_ARITY(1, kExprBrTable);
 
   EXPECT_ARITY(1, kExprBr, ARITY_1);
   EXPECT_ARITY(2, kExprBrIf, ARITY_1);
   EXPECT_ARITY(2, kExprBrTable, ARITY_1);
 
   {
-    sig = sigs.v_v();
     EXPECT_ARITY(0, kExprReturn, ARITY_0);
-    sig = sigs.i_i();
     EXPECT_ARITY(1, kExprReturn, ARITY_1);
   }
 }
 
 
 TEST_F(WasmOpcodeArityTest, Misc) {
-  FunctionSig* sig = sigs.v_v();
   EXPECT_ARITY(0, kExprI8Const);
   EXPECT_ARITY(0, kExprI32Const);
   EXPECT_ARITY(0, kExprF32Const);
   EXPECT_ARITY(0, kExprI64Const);
   EXPECT_ARITY(0, kExprF64Const);
   EXPECT_ARITY(0, kExprGetLocal);
   EXPECT_ARITY(1, kExprSetLocal);
   EXPECT_ARITY(0, kExprLoadGlobal);
   EXPECT_ARITY(1, kExprStoreGlobal);
 }
 
 
 TEST_F(WasmOpcodeArityTest, Calls) {
-  module.AddFunction(sigs.i_ii());
-  module.AddFunction(sigs.i_i());
-
-  module.AddSignature(sigs.f_ff());
-  module.AddSignature(sigs.i_d());
-
-  module.AddImport(sigs.f_ff());
-  module.AddImport(sigs.i_d());
-
   {
-    FunctionSig* sig = sigs.i_ii();
-
     EXPECT_ARITY(2, kExprCallFunction, 2, 0);
     EXPECT_ARITY(2, kExprCallImport, 2, 0);
     EXPECT_ARITY(3, kExprCallIndirect, 2, 0);
 
     EXPECT_ARITY(1, kExprBr, ARITY_1);
     EXPECT_ARITY(2, kExprBrIf, ARITY_1);
     EXPECT_ARITY(2, kExprBrTable, ARITY_1);
 
     EXPECT_ARITY(0, kExprBr, ARITY_0);
     EXPECT_ARITY(1, kExprBrIf, ARITY_0);
     EXPECT_ARITY(1, kExprBrTable, ARITY_0);
   }
 
   {
-    FunctionSig* sig = sigs.v_v();
-
     EXPECT_ARITY(1, kExprCallFunction, ARITY_1, 1);
     EXPECT_ARITY(1, kExprCallImport, ARITY_1, 1);
     EXPECT_ARITY(2, kExprCallIndirect, ARITY_1, 1);
 
     EXPECT_ARITY(1, kExprBr, ARITY_1);
     EXPECT_ARITY(2, kExprBrIf, ARITY_1);
     EXPECT_ARITY(2, kExprBrTable, ARITY_1);
 
     EXPECT_ARITY(0, kExprBr, ARITY_0);
     EXPECT_ARITY(1, kExprBrIf, ARITY_0);
     EXPECT_ARITY(1, kExprBrTable, ARITY_0);
   }
 }
 
 
 TEST_F(WasmOpcodeArityTest, LoadsAndStores) {
-  FunctionSig* sig = sigs.v_v();
   EXPECT_ARITY(1, kExprI32LoadMem8S);
   EXPECT_ARITY(1, kExprI32LoadMem8U);
   EXPECT_ARITY(1, kExprI32LoadMem16S);
   EXPECT_ARITY(1, kExprI32LoadMem16U);
   EXPECT_ARITY(1, kExprI32LoadMem);
 
   EXPECT_ARITY(1, kExprI64LoadMem8S);
   EXPECT_ARITY(1, kExprI64LoadMem8U);
   EXPECT_ARITY(1, kExprI64LoadMem16S);
   EXPECT_ARITY(1, kExprI64LoadMem16U);
   EXPECT_ARITY(1, kExprI64LoadMem32S);
   EXPECT_ARITY(1, kExprI64LoadMem32U);
   EXPECT_ARITY(1, kExprI64LoadMem);
   EXPECT_ARITY(1, kExprF32LoadMem);
   EXPECT_ARITY(1, kExprF64LoadMem);
 
   EXPECT_ARITY(2, kExprI32StoreMem8);
   EXPECT_ARITY(2, kExprI32StoreMem16);
   EXPECT_ARITY(2, kExprI32StoreMem);
   EXPECT_ARITY(2, kExprI64StoreMem8);
   EXPECT_ARITY(2, kExprI64StoreMem16);
   EXPECT_ARITY(2, kExprI64StoreMem32);
   EXPECT_ARITY(2, kExprI64StoreMem);
   EXPECT_ARITY(2, kExprF32StoreMem);
   EXPECT_ARITY(2, kExprF64StoreMem);
 }
 
 
 TEST_F(WasmOpcodeArityTest, MiscMemExpressions) {
-  FunctionSig* sig = sigs.v_v();
   EXPECT_ARITY(0, kExprMemorySize);
   EXPECT_ARITY(1, kExprGrowMemory);
 }
 
 
 TEST_F(WasmOpcodeArityTest, SimpleExpressions) {
-  FunctionSig* sig = sigs.v_v();
   EXPECT_ARITY(2, kExprI32Add);
   EXPECT_ARITY(2, kExprI32Sub);
   EXPECT_ARITY(2, kExprI32Mul);
   EXPECT_ARITY(2, kExprI32DivS);
   EXPECT_ARITY(2, kExprI32DivU);
   EXPECT_ARITY(2, kExprI32RemS);
   EXPECT_ARITY(2, kExprI32RemU);
   EXPECT_ARITY(2, kExprI32And);
   EXPECT_ARITY(2, kExprI32Ior);
   EXPECT_ARITY(2, kExprI32Xor);
@@ skipping 223 matching lines @@
   size_t pos = 0;
   pos = ExpectRun(map, pos, kAstF32, 5);
   pos = ExpectRun(map, pos, kAstI32, 1337);
   pos = ExpectRun(map, pos, kAstI64, 212);
   delete[] data;
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8