Make `Name` a pointer, length pair (#5122)

With the goal of supporting null characters (i.e. zero bytes) in strings.
Rewrite the underlying interned `IString` to store a `std::string_view` rather
than a `const char*`, reduce the number of map lookups necessary to intern a
string, and present a more immutable interface.

Most importantly, replace the `c_str()` method that returned a `const char*`
with a `toString()` method that returns a `std::string`. This new method can
correctly handle strings containing null characters. A `const char*` can still
be had by calling `data()` on the `std::string_view`, although this usage should
be discouraged.

This change is NFC in spirit, although not in practice. It does not intend to
support any particular new functionality, but it is probably now possible to use
strings containing null characters in at least some cases. At least one parser
bug is also incidentally fixed. Follow-on PRs will explicitly support and test
strings containing nulls for particular use cases.

The C API still uses `const char*` to represent strings. As strings containing
nulls become better supported by the rest of Binaryen, this will no longer be
sufficient. Updating the C and JS APIs to use pointer, length pairs is left as
future work.

1 files changed, 20 insertions, 20 deletions

diff --git a/src/wasm2js.h b/src/wasm2js.h
index ceae32eb9..2ae22de09 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -230,7 +230,7 @@ public:
     // First up check our cached of mangled names to avoid doing extra work
     // below
     auto& map = wasmNameToMangledName[(int)scope];
-    auto it = map.find(name.c_str());
+    auto it = map.find(name.str.data());
     if (it != map.end()) {
       return it->second;
     }
@@ -249,7 +249,7 @@ public:
     IString ret;
     for (int i = 0;; i++) {
       std::ostringstream out;
-      out << name.c_str();
+      out << name;
       if (i > 0) {
         out << "_" << i;
       }
@@ -276,7 +276,7 @@ public:
       }
       // We found a good name, use it.
       scopeMangledNames.insert(ret);
-      map[name.c_str()] = ret;
+      map[name.str.data()] = ret;
       return ret;
     }
   }
@@ -586,7 +586,7 @@ void Wasm2JSBuilder::addBasics(Ref ast, Module* wasm) {
 }
 
 static bool needsQuoting(Name name) {
-  auto mangled = asmangle(name.str);
+  auto mangled = asmangle(name.toString());
   return mangled != name.str;
 }
 
@@ -717,7 +717,7 @@ void Wasm2JSBuilder::addTable(Ref ast, Module* wasm) {
               } else if (auto* get = offset->dynCast<GlobalGet>()) {
                 index = ValueBuilder::makeBinary(
                   ValueBuilder::makeName(
-                    stringToIString(asmangle(get->name.str))),
+                    stringToIString(asmangle(get->name.toString()))),
                   PLUS,
                   ValueBuilder::makeNum(i));
               } else {
@@ -807,7 +807,7 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
         // setter
         {
           std::ostringstream buffer;
-          buffer << '_' << identName.c_str();
+          buffer << '_' << identName;
           auto setterParam = stringToIString(buffer.str());
 
           auto block = ValueBuilder::makeBlock();
@@ -2615,8 +2615,8 @@ void Wasm2JSGlue::emitPreES6() {
     }
     baseModuleMap[base] = module;
     if (seenModules.count(module) == 0) {
-      out << "import * as " << asmangle(module.str) << " from '" << module.str
-          << "';\n";
+      out << "import * as " << asmangle(module.toString()) << " from '"
+          << module << "';\n";
       seenModules.insert(module);
     }
   };
@@ -2678,8 +2678,8 @@ void Wasm2JSGlue::emitPostES6() {
     if (seenModules.count(import->module) > 0) {
       return;
     }
-    out << "  \"" << import->module << "\": " << asmangle(import->module.str)
-        << ",\n";
+    out << "  \"" << import->module
+        << "\": " << asmangle(import->module.toString()) << ",\n";
     seenModules.insert(import->module);
   });
 
@@ -2690,7 +2690,7 @@ void Wasm2JSGlue::emitPostES6() {
       return;
     }
     out << "  \"" << import->module << "\": {\n";
-    out << "    " << asmangle(import->base.str) << ": { buffer : mem"
+    out << "    " << asmangle(import->base.toString()) << ": { buffer : mem"
         << moduleName.str << " }\n";
     out << "  },\n";
   });
@@ -2704,8 +2704,8 @@ void Wasm2JSGlue::emitPostES6() {
     if (seenModules.count(import->module) > 0) {
       return;
     }
-    out << "  \"" << import->module << "\": " << asmangle(import->module.str)
-        << ",\n";
+    out << "  \"" << import->module
+        << "\": " << asmangle(import->module.toString()) << ",\n";
     seenModules.insert(import->module);
   });
 
@@ -2729,15 +2729,15 @@ void Wasm2JSGlue::emitPostES6() {
         continue;
     }
     std::ostringstream export_name;
-    for (auto* ptr = exp->name.str; *ptr; ptr++) {
-      if (*ptr == '-') {
+    for (char c : exp->name.str) {
+      if (c == '-') {
         export_name << '_';
       } else {
-        export_name << *ptr;
+        export_name << c;
       }
     }
-    out << "export var " << asmangle(exp->name.str) << " = ret"
-        << moduleName.str << "." << asmangle(exp->name.str) << ";\n";
+    out << "export var " << asmangle(exp->name.toString()) << " = ret"
+        << moduleName << "." << asmangle(exp->name.toString()) << ";\n";
   }
 }
 
@@ -2816,8 +2816,8 @@ void Wasm2JSGlue::emitMemory() {
       if (auto* get = segment.offset->dynCast<GlobalGet>()) {
         auto internalName = get->name;
         auto importedGlobal = wasm.getGlobal(internalName);
-        return std::string("imports['") + importedGlobal->module.str + "']['" +
-               importedGlobal->base.str + "']";
+        return std::string("imports['") + importedGlobal->module.toString() +
+               "']['" + importedGlobal->base.toString() + "']";
       }
       Fatal() << "non-constant offsets aren't supported yet\n";
     };