[WebAssembly] Remove a second parameter from toString().

[ruiu]

Summary

toString(T) is a stringize function for an object of type T. Each type
that has that function defined should know how to stringize itself, and
there should be one string representation of an object. Passing a
"supplemental" argument to toString() breaks that princple. We shouldn't
add a second parameter to that function.

[ncw]

OK, sorry! Looks better.

[sbc100]

wasm/Symbols.cpp

186

I'm ok with this change, but I like this feature, so I would like to bring it back in some form, perhaps for all backends. Otherwise it makes very long C++ symbols very hard to distinguish from the rest of the error/message.

This is what gnu ld does I believe.

[ruiu]

wasm/Symbols.cpp

186

If you need this, please do it all the times, or do it on the caller side. I want to keep toString() an unary function that converts a given object to its (only) string representation.

[ncw]

wasm/Symbols.cpp

186

I'll sort this out by updating D44316 - it was my mess, sorry.

Fix: toString will always quote unmangled names, and check Config->Demangle. I'll add another helper that doesn't check Config->Demangle and doesn't quote, for use in creating the "Name" section.

wasm/Driver.cpp

for (Symbol *Sym : Symtab->getSymbols()) {
 
     // It is possible for undefined functions not to have a signature (eg. if
     // added via "--undefined"), but weak undefined ones do have a signature.
     assert(FuncSym->getFunctionType());
     const WasmSignature &Sig = *FuncSym->getFunctionType();
 
     // Add a synthetic dummy for weak undefined functions.  These dummies will
     // be GC'd if not used as the target of any "call" instructions.
-    StringRef StubName =
-        Saver.save("undefined function " + toString(*Sym, false));
+    StringRef StubName = Saver.save("undefined function " + toString(*Sym));
     SyntheticFunction *Func = make<SyntheticFunction>(Sig, StubName);
     Func->setBody(UnreachableFn);
     // Ensure it compares equal to the null pointer, and so that table relocs
     // don't pull in the stub body (only call-operand relocs should do that).
     Func->setTableIndex(0);
     Symtab->SyntheticFunctions.emplace_back(Func);
     // Hide our dummy to prevent export.
     uint32_t Flags = WASM_SYMBOL_VISIBILITY_HIDDEN;

wasm/Symbols.h

T *replaceSymbol(Symbol *S, ArgT &&... Arg) {
   assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
          "Not a Symbol");
   return new (S) T(std::forward<ArgT>(Arg)...);
 }
 
 } // namespace wasm
 
 // Returns a symbol name for an error message.
-std::string toString(const wasm::Symbol &Sym, bool QuoteDemangled = true);
+std::string toString(const wasm::Symbol &Sym);
 std::string toString(wasm::Symbol::Kind Kind);
 std::string toString(WasmSymbolType Type);
 
 } // namespace lld
 
 #endif

wasm/Symbols.cpp

 DefinedGlobal::DefinedGlobal(StringRef Name, uint32_t Flags, InputFile *File,
                              InputGlobal *Global)
     : GlobalSymbol(Name, DefinedGlobalKind, Flags, File,
                    Global ? &Global->getType() : nullptr),
       Global(Global) {}
 
 void LazySymbol::fetch() { cast<ArchiveFile>(File)->addMember(&ArchiveSymbol); }
 
-std::string lld::toString(const wasm::Symbol &Sym, bool QuoteDemangled) {
+std::string lld::toString(const wasm::Symbol &Sym) {
   if (Config->Demangle)
     if (Optional<std::string> S = demangleItanium(Sym.getName()))
-      return QuoteDemangled ? ("`" + *S + "'") : *S;
+      return *S;
   return Sym.getName();
 }
 
 std::string lld::toString(wasm::Symbol::Kind Kind) {
   switch (Kind) {
   case wasm::Symbol::DefinedFunctionKind:
     return "DefinedFunction";
   case wasm::Symbol::DefinedDataKind: