[wasm] Rework encoding of local declarations.

test/cctest/wasm/test-run-wasm-64.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 <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "src/wasm/wasm-macro-gen.h"
 
@@ skipping 155 matching lines @@
     TestingModule module;
     WasmFunctionCompiler t(&sig, &module);
     if (i == 2 || i == 3) {
       continue;
     } else {
       BUILD(t, WASM_GET_LOCAL(i));
     }
     uint32_t index = t.CompileAndAdd();
 
     // Build the calling function.
-    WasmRunner<int32_t> r;
-    r.env()->module = &module;
+    WasmRunner<int32_t> r(&module);
     BUILD(r,
           WASM_I32_CONVERT_I64(WASM_CALL_FUNCTION(
               index, WASM_I64(0xbcd12340000000b), WASM_I64(0xbcd12340000000c),
               WASM_I32(0xd), WASM_I32_CONVERT_I64(WASM_I64(0xbcd12340000000e)),
               WASM_I64(0xbcd12340000000f), WASM_I64(0xbcd1234000000010),
               WASM_I64(0xbcd1234000000011), WASM_I64(0xbcd1234000000012),
               WASM_I64(0xbcd1234000000013), WASM_I64(0xbcd1234000000014),
               WASM_I64(0xbcd1234000000015), WASM_I64(0xbcd1234000000016),
               WASM_I64(0xbcd1234000000017), WASM_I64(0xbcd1234000000018),
               WASM_I64(0xbcd1234000000019), WASM_I64(0xbcd123400000001a),
               WASM_I64(0xbcd123400000001b), WASM_I64(0xbcd123400000001c),
               WASM_I64(0xbcd123400000001d))));
 
     CHECK_EQ(i + 0xb, r.Call());
   }
 }