[wasm] Rename encoder.(cc,h) to wasm-module-builder.(cc,h)

R=bradnelson@chromium.org,mtrofin@chromium.org,mstarzinger@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2383463002
Cr-Commit-Position: refs/heads/master@{#39861}

BUILD.gn

@@ -1677,8 +1677,6 @@ v8_source_set("v8_base") {
     "src/wasm/ast-decoder.cc",
     "src/wasm/ast-decoder.h",
     "src/wasm/decoder.h",
-    "src/wasm/encoder.cc",
-    "src/wasm/encoder.h",
     "src/wasm/leb-helper.h",
     "src/wasm/module-decoder.cc",
     "src/wasm/module-decoder.h",
@@ -1695,6 +1693,8 @@ v8_source_set("v8_base") {
     "src/wasm/wasm-js.cc",
     "src/wasm/wasm-js.h",
     "src/wasm/wasm-macro-gen.h",
+    "src/wasm/wasm-module-builder.cc",
+    "src/wasm/wasm-module-builder.h",
     "src/wasm/wasm-module.cc",
     "src/wasm/wasm-module.h",
     "src/wasm/wasm-opcodes.cc",

src/asmjs/asm-js.cc

@@ -16,9 +16,9 @@
 #include "src/objects.h"
 #include "src/parsing/parse-info.h"
 
-#include "src/wasm/encoder.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-js.h"
+#include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-result.h"
 

src/asmjs/asm-wasm-builder.h

@@ -8,7 +8,7 @@
 #include "src/allocation.h"
 #include "src/asmjs/asm-typer.h"
 #include "src/objects.h"
-#include "src/wasm/encoder.h"
+#include "src/wasm/wasm-module-builder.h"
 #include "src/zone/zone.h"
 
 namespace v8 {

src/v8.gyp

@@ -1247,8 +1247,6 @@
         'wasm/ast-decoder.cc',
         'wasm/ast-decoder.h',
         'wasm/decoder.h',
-        'wasm/encoder.cc',
-        'wasm/encoder.h',
         'wasm/leb-helper.h',
         'wasm/module-decoder.cc',
         'wasm/module-decoder.h',
@@ -1265,6 +1263,8 @@
         'wasm/wasm-macro-gen.h',
         'wasm/wasm-module.cc',
         'wasm/wasm-module.h',
+        'wasm/wasm-module-builder.cc',
+        'wasm/wasm-module-builder.h',
         'wasm/wasm-interpreter.cc',
         'wasm/wasm-interpreter.h',
         'wasm/wasm-opcodes.cc',

src/wasm/wasm-js.cc

@@ -16,7 +16,6 @@
 #include "src/objects.h"
 #include "src/parsing/parse-info.h"
 
-#include "src/wasm/encoder.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-js.h"
 #include "src/wasm/wasm-module.h"

src/wasm/encoder.cc → src/wasm/wasm-module-builder.cc

@@ -9,9 +9,9 @@
 #include "src/zone/zone-containers.h"
 
 #include "src/wasm/ast-decoder.h"
-#include "src/wasm/encoder.h"
 #include "src/wasm/leb-helper.h"
 #include "src/wasm/wasm-macro-gen.h"
+#include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes.h"
 

src/wasm/encoder.h → src/wasm/wasm-module-builder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_WASM_ENCODER_H_
-#define V8_WASM_ENCODER_H_
+#ifndef V8_WASM_WASM_MODULE_BUILDER_H_
+#define V8_WASM_WASM_MODULE_BUILDER_H_
 
 #include "src/signature.h"
 #include "src/zone/zone-containers.h"
@@ -261,4 +261,4 @@ inline FunctionSig* WasmFunctionBuilder::signature() {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_WASM_ENCODER_H_
+#endif  // V8_WASM_WASM_MODULE_BUILDER_H_

test/cctest/wasm/test-run-wasm-module.cc

@@ -5,9 +5,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/wasm/encoder.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-macro-gen.h"
+#include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes.h"
 

test/fuzzer/wasm-code.cc

@@ -8,8 +8,8 @@
 #include "include/v8.h"
 #include "src/isolate.h"
 #include "src/objects.h"
-#include "src/wasm/encoder.h"
 #include "src/wasm/wasm-interpreter.h"
+#include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
 #include "test/cctest/wasm/test-signatures.h"
 #include "test/common/wasm/wasm-module-runner.h"

test/fuzzer/wasm-section-fuzzers.cc

@@ -6,7 +6,7 @@
 
 #include "include/v8.h"
 #include "src/isolate.h"
-#include "src/wasm/encoder.h"
+#include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
 #include "src/zone/accounting-allocator.h"
 #include "src/zone/zone.h"

test/unittests/BUILD.gn

@@ -122,12 +122,12 @@ v8_executable("unittests") {
     "wasm/ast-decoder-unittest.cc",
     "wasm/control-transfer-unittest.cc",
     "wasm/decoder-unittest.cc",
-    "wasm/encoder-unittest.cc",
     "wasm/leb-helper-unittest.cc",
     "wasm/loop-assignment-analysis-unittest.cc",
     "wasm/module-decoder-unittest.cc",
     "wasm/switch-logic-unittest.cc",
     "wasm/wasm-macro-gen-unittest.cc",
+    "wasm/wasm-module-builder-unittest.cc",
   ]
 
   if (v8_current_cpu == "arm") {

test/unittests/unittests.gyp

@@ -120,12 +120,12 @@
       'wasm/ast-decoder-unittest.cc',
       'wasm/control-transfer-unittest.cc',
       'wasm/decoder-unittest.cc',
-      'wasm/encoder-unittest.cc',
       'wasm/leb-helper-unittest.cc',
       'wasm/loop-assignment-analysis-unittest.cc',
       'wasm/module-decoder-unittest.cc',
       'wasm/switch-logic-unittest.cc',
       'wasm/wasm-macro-gen-unittest.cc',
+      'wasm/wasm-module-builder-unittest.cc',
     ],
     'unittests_sources_arm': [  ### gcmole(arch:arm) ###
       'compiler/arm/instruction-selector-arm-unittest.cc',

test/unittests/wasm/encoder-unittest.cc → test/unittests/wasm/wasm-module-builder-unittest.cc

@@ -7,7 +7,7 @@
 #include "src/v8.h"
 
 #include "src/wasm/ast-decoder.h"
-#include "src/wasm/encoder.h"
+#include "src/wasm/wasm-module-builder.h"
 
 #include "test/cctest/wasm/test-signatures.h"
 
@@ -15,7 +15,7 @@ namespace v8 {
 namespace internal {
 namespace wasm {
 
-class EncoderTest : public TestWithZone {
+class WasmModuleBuilderTest : public TestWithZone {
  protected:
   void AddLocal(WasmFunctionBuilder* f, LocalType type) {
     uint16_t index = f->AddLocal(type);
@@ -23,7 +23,7 @@ class EncoderTest : public TestWithZone {
   }
 };
 
-TEST_F(EncoderTest, Regression_647329) {
+TEST_F(WasmModuleBuilderTest, Regression_647329) {
   // Test crashed with asan.
   ZoneBuffer buffer(zone());
   const size_t kSize = ZoneBuffer::kInitialSize * 3 + 4096 + 100;