wasm: use strings for section names

test/mjsunit/wasm/wasm-module-builder.js

Index: test/mjsunit/wasm/wasm-module-builder.js
diff --git a/test/mjsunit/wasm/wasm-module-builder.js b/test/mjsunit/wasm/wasm-module-builder.js
index 59166fc9e45679b122a342cdf0d810c3903dc98d..8e618808600ed8ace4abf33cb12b07f3fd39e8c1 100644
--- a/test/mjsunit/wasm/wasm-module-builder.js
+++ b/test/mjsunit/wasm/wasm-module-builder.js
@@ -136,147 +136,171 @@ function emit_varint(bytes, val) {
     }
 }
 
+function emit_section(bytes, section_code, content_generator) {
+    // Start the section in a temporary buffer: its full length isn't know yet.
+    var tmp_bytes = [];
+    var string = section_names[section_code];
+    emit_varint(tmp_bytes, string.length);
+    for (var i = 0; i != string.length; ++i) {
+        tmp_bytes.push(string.charCodeAt(i));
+    }
+  content_generator(tmp_bytes);
+  // Now that we know the section length, emit it and copy the section.
+  emit_varint(bytes, tmp_bytes.length);
+  Array.prototype.push.apply(bytes, tmp_bytes);
+}
+
 WasmModuleBuilder.prototype.toArray = function(debug) {
     // Add header bytes
     var bytes = [];
     bytes = bytes.concat([kWasmH0, kWasmH1, kWasmH2, kWasmH3,
                           kWasmV0, kWasmV1, kWasmV2, kWasmV3]);
 
+    var wasm = this;
+
     // Add memory section
-    if (this.memory != undefined) {
+    if (wasm.memory != undefined) {
         if (debug) print("emitting memory @ " + bytes.length);
-        emit_u8(bytes, kDeclMemory);
-        emit_varint(bytes, this.memory.min);
-        emit_varint(bytes, this.memory.max);
-        emit_u8(bytes, this.memory.exp ? 1 : 0);
+        emit_section(bytes, kDeclMemory, function(bytes) {
+            emit_varint(bytes, wasm.memory.min);
+            emit_varint(bytes, wasm.memory.max);
+            emit_u8(bytes, wasm.memory.exp ? 1 : 0);
+        });
     }
 
     // Add signatures section
-    if (this.signatures.length > 0) {
+    if (wasm.signatures.length > 0) {
         if (debug) print("emitting signatures @ " + bytes.length);
-        emit_u8(bytes, kDeclSignatures);
-        emit_varint(bytes, this.signatures.length);
-        for (sig of this.signatures) {
-            var params = sig.length - 1;
-            emit_u8(bytes, params);
-            for (var j = 0; j < sig.length; j++) {
-                emit_u8(bytes, sig[j]);
+        emit_section(bytes, kDeclSignatures, function(bytes) {
+            emit_varint(bytes, wasm.signatures.length);
+            for (sig of wasm.signatures) {
+                var params = sig.length - 1;
+                emit_u8(bytes, params);
+                for (var j = 0; j < sig.length; j++) {
+                    emit_u8(bytes, sig[j]);
+                }
             }
-        }
+        });
     }
 
     // Add imports section
-    if (this.imports.length > 0) {
+    if (wasm.imports.length > 0) {
         if (debug) print("emitting imports @ " + bytes.length);
-        emit_u8(bytes, kDeclImportTable);
-        emit_varint(bytes, this.imports.length);
-        for (imp of this.imports) {
-            emit_u16(bytes, imp.sig_index);
-            emit_string(bytes, "");
-            emit_string(bytes, imp.name);
-        }
+        emit_section(bytes, kDeclImportTable, function(bytes) {
+            emit_varint(bytes, wasm.imports.length);
+            for (imp of wasm.imports) {
+                emit_u16(bytes, imp.sig_index);
+                emit_string(bytes, "");
+                emit_string(bytes, imp.name);
+            }
+        });
     }
 
     // Add functions section
     var names = false;
     var exports = 0;
-    if (this.functions.length > 0) {
+    if (wasm.functions.length > 0) {
         if (debug) print("emitting functions @ " + bytes.length);
-        emit_u8(bytes, kDeclFunctions);
-        emit_varint(bytes, this.functions.length);
-        var index = 0;
-        for (func of this.functions) {
-            var flags = 0;
-            var hasName = func.name != undefined && func.name.length > 0;
-            names = names || hasName;
-            if (hasName) flags |= kDeclFunctionName;
-            exports += func.exports.length;
-
-            emit_u8(bytes, flags);
-            emit_u16(bytes, func.sig_index);
-
-            if (hasName) emit_string(bytes, func.name);
-
-            // Function body length will be patched later.
-            var length_pos = bytes.length;
-            emit_u16(bytes, 0);
-
-            var local_decls = [];
-            var l = func.locals;
-            if (l != undefined) {
-              var local_decls_count = 0;
-              if (l.i32_count > 0) {
-                local_decls.push({count: l.i32_count, type: kAstI32});
-              }
-              if (l.i64_count > 0) {
-                local_decls.push({count: l.i64_count, type: kAstI64});
-              }
-              if (l.f32_count > 0) {
-                local_decls.push({count: l.f32_count, type: kAstF32});
-              }
-              if (l.f64_count > 0) {
-                local_decls.push({count: l.f64_count, type: kAstF64});
-              }
+        emit_section(bytes, kDeclFunctions, function(bytes) {
+            emit_varint(bytes, wasm.functions.length);
+            var index = 0;
+            for (func of wasm.functions) {
+                var flags = 0;
+                var hasName = func.name != undefined && func.name.length > 0;
+                names = names || hasName;
+                if (hasName) flags |= kDeclFunctionName;
+                exports += func.exports.length;
+
+                emit_u8(bytes, flags);
+                emit_u16(bytes, func.sig_index);
+
+                if (hasName) emit_string(bytes, func.name);
+
+                // Function body length will be patched later.
+                var length_pos = bytes.length;
+                emit_u16(bytes, 0);
+
+                var local_decls = [];
+                var l = func.locals;
+                if (l != undefined) {
+                  var local_decls_count = 0;
+                  if (l.i32_count > 0) {
+                    local_decls.push({count: l.i32_count, type: kAstI32});
+                  }
+                  if (l.i64_count > 0) {
+                    local_decls.push({count: l.i64_count, type: kAstI64});
+                  }
+                  if (l.f32_count > 0) {
+                    local_decls.push({count: l.f32_count, type: kAstF32});
+                  }
+                  if (l.f64_count > 0) {
+                    local_decls.push({count: l.f64_count, type: kAstF64});
+                  }
+                }
+                emit_u8(bytes, local_decls.length);
+                for (decl of local_decls) {
+                  emit_varint(bytes, decl.count);
+                  emit_u8(bytes, decl.type);
+                }
+
+                for (var i = 0; i < func.body.length; i++) {
+                    emit_u8(bytes, func.body[i]);
+                }
+                var length = bytes.length - length_pos - 2;
+                bytes[length_pos] = length & 0xff;
+                bytes[length_pos + 1] = (length >> 8) & 0xff;
+
+                index++;
             }
-            emit_u8(bytes, local_decls.length);
-            for (decl of local_decls) {
-              emit_varint(bytes, decl.count);
-              emit_u8(bytes, decl.type);
-            }
-
-            for (var i = 0; i < func.body.length; i++) {
-                emit_u8(bytes, func.body[i]);
-            }
-            var length = bytes.length - length_pos - 2;
-            bytes[length_pos] = length & 0xff;
-            bytes[length_pos + 1] = (length >> 8) & 0xff;
-
-            index++;
-        }
+        });
     }
 
     // Add start function section.
-    if (this.start_index != undefined) {
+    if (wasm.start_index != undefined) {
         if (debug) print("emitting start function @ " + bytes.length);
-      emit_u8(bytes, kDeclStartFunction);
-      emit_varint(bytes, this.start_index);
+        emit_section(bytes, kDeclStartFunction, function(bytes) {
+            emit_varint(bytes, wasm.start_index);
+        });
     }
 
-    if (this.function_table.length > 0) {
+    if (wasm.function_table.length > 0) {
         if (debug) print("emitting function table @ " + bytes.length);
-        emit_u8(bytes, kDeclFunctionTable);
-        emit_varint(bytes, this.function_table.length);
-        for (index of this.function_table) {
-            emit_u16(bytes, index);
-        }
+        emit_section(bytes, kDeclFunctionTable, function(bytes) {
+            emit_varint(bytes, wasm.function_table.length);
+            for (index of wasm.function_table) {
+                emit_u16(bytes, index);
+            }
+        });
     }
 
     if (exports > 0) {
         if (debug) print("emitting exports @ " + bytes.length);
-        emit_u8(bytes, kDeclExportTable);
-        emit_varint(bytes, exports);
-        for (func of this.functions) {
-            for (exp of func.exports) {
-                emit_u16(bytes, func.index);
-                emit_string(bytes, exp);
+        emit_section(bytes, kDeclExportTable, function(bytes) {
+            emit_varint(bytes, exports);
+            for (func of wasm.functions) {
+                for (exp of func.exports) {
+                    emit_u16(bytes, func.index);
+                    emit_string(bytes, exp);
+                }
             }
-        }
+        });
     }
 
-    if (this.data_segments.length > 0) {
+    if (wasm.data_segments.length > 0) {
         if (debug) print("emitting data segments @ " + bytes.length);
-        emit_u8(bytes, kDeclDataSegments);
-        emit_varint(bytes, this.data_segments.length);
-        for (seg of this.data_segments) {
-            emit_u32(bytes, seg.addr);
-            emit_data_ref(bytes, seg.data);
-            emit_u32(bytes, seg.data.length);
-            emit_u8(bytes, seg.init ? 1 : 0);
-        }
+        emit_section(bytes, kDeclDataSegments, function(bytes) {
+            emit_varint(bytes, wasm.data_segments.length);
+            for (seg of wasm.data_segments) {
+                emit_u32(bytes, seg.addr);
+                emit_data_ref(bytes, seg.data);
+                emit_u32(bytes, seg.data.length);
+                emit_u8(bytes, seg.init ? 1 : 0);
+            }
+        });
     }
 
     // Emit any explicitly added sections
-    for (exp of this.explicit) {
+    for (exp of wasm.explicit) {
         if (debug) print("emitting explicit @ " + bytes.length);
         for (var i = 0; i < exp.length; i++) {
             emit_u8(bytes, exp[i]);
@@ -285,7 +309,7 @@ WasmModuleBuilder.prototype.toArray = function(debug) {
 
     // End the module.
     if (debug) print("emitting end @ " + bytes.length);
-    emit_u8(bytes, kDeclEnd);
+    emit_section(bytes, kDeclEnd, function(bytes) {});
 
     // Collect references and canonicalize strings.
     var strings = new Object();