Separate function decoding counter into asm and wasm counters.

test/unittests/wasm/module-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/handles.h"
 #include "src/objects-inl.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-limits.h"
@@ skipping 901 matching lines @@
   EXPECT_EQ(nullptr, sig);
 }
 
 TEST_F(WasmSignatureDecodeTest, Fail_invalid_param_type2) {
   static const byte data[] = {SIG_ENTRY_x_xx(kLocalI32, kLocalI32, kLocalVoid)};
   FunctionSig* sig =
       DecodeWasmSignatureForTesting(zone(), data, data + sizeof(data));
   EXPECT_EQ(nullptr, sig);
 }
 
-class WasmFunctionVerifyTest : public TestWithIsolateAndZone {};
+class WasmFunctionVerifyTest : public TestWithIsolateAndZone {

[Karl, 2017/03/28 01:53:16]

Added class fields to implement a dummy instance of ModuleBytesEnv for function
DecodeWasmFunction below.

+ public:
+  WasmFunctionVerifyTest()
+      : instance(&module), env(&module, &instance, bytes) {}
+  virtual ~WasmFunctionVerifyTest() {}
+
+  ModuleBytesEnv* get_env() { return &env; }
+
+ private:
+  WasmModule module;
+  WasmInstance instance;
+  Vector<const byte> bytes;
+  ModuleBytesEnv env;
+  DISALLOW_COPY_AND_ASSIGN(WasmFunctionVerifyTest);
+};
 
 TEST_F(WasmFunctionVerifyTest, Ok_v_v_empty) {
   static const byte data[] = {
       SIG_ENTRY_v_v,  // signature entry
       4,              // locals
       3,
       kLocalI32,  // --
       4,
       kLocalI64,  // --
       5,
       kLocalF32,  // --
       6,
       kLocalF64,  // --
       kExprEnd    // body
   };
 
-  FunctionResult result =
-      DecodeWasmFunction(isolate(), zone(), nullptr, data, data + sizeof(data));
+  FunctionResult result = DecodeWasmFunction(isolate(), zone(), get_env(), data,
+                                             data + sizeof(data));
   EXPECT_OK(result);
 
   if (result.val && result.ok()) {
     WasmFunction* function = result.val;
     EXPECT_EQ(0u, function->sig->parameter_count());
     EXPECT_EQ(0u, function->sig->return_count());
     EXPECT_EQ(0u, function->name_offset);
     EXPECT_EQ(static_cast<uint32_t>(SIZEOF_SIG_ENTRY_v_v),
               function->code_start_offset);
     EXPECT_EQ(sizeof(data), function->code_end_offset);
@@ skipping 664 matching lines @@
       {19, 20, 1, 21, 2, 4},  // --
       {29, 30, 5, 35, 2, 8},  // --
   };
 
   CheckSections(data, data + sizeof(data), expected, arraysize(expected));
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8