Consistent use of <internal> when displaying internal symbol names

Differential Revision: https://reviews.llvm.org/D40510 llvm-svn: 319108
llvm · Nov 27, 2017 · e2ed092 · e2ed092
1 parent a08d65d
commit e2ed092
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp
@@ -411,7 +411,7 @@ static StringRef getBasename(StringRef Path) {
 // Returns a string in the format of "foo.obj" or "foo.obj(bar.lib)".
 std::string lld::toString(coff::InputFile *File) {
   if (!File)
-    return "(internal)";
+    return "<internal>";
   if (File->ParentName.empty())
     return File->getName().lower();
 

diff --git a/lld/COFF/SymbolTable.cpp b/lld/COFF/SymbolTable.cpp
@@ -200,8 +200,7 @@ void SymbolTable::addLazy(ArchiveFile *F, const Archive::Symbol Sym) {
 
 void SymbolTable::reportDuplicate(Symbol *Existing, InputFile *NewFile) {
   error("duplicate symbol: " + toString(*Existing) + " in " +
-        toString(Existing->getFile()) + " and in " +
-        (NewFile ? toString(NewFile) : "(internal)"));
+        toString(Existing->getFile()) + " and in " + toString(NewFile));
 }
 
 Symbol *SymbolTable::addAbsolute(StringRef N, COFFSymbolRef Sym) {

diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
@@ -42,7 +42,7 @@ namespace elf {
 class InputFile;
 }
 
-// Returns "(internal)", "foo.a(bar.o)" or "baz.o".
+// Returns "<internal>", "foo.a(bar.o)" or "baz.o".
 std::string toString(const elf::InputFile *F);
 
 namespace elf {

diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
@@ -308,7 +308,7 @@ std::string InputSectionBase::getSrcMsg(const Symbol &Sym, uint64_t Offset) {
 std::string InputSectionBase::getObjMsg(uint64_t Off) {
   // Synthetic sections don't have input files.
   if (!File)
-    return ("(internal):(" + Name + "+0x" + utohexstr(Off) + ")").str();
+    return ("<internal>:(" + Name + "+0x" + utohexstr(Off) + ")").str();
   std::string Filename = File->getName();
 
   std::string Archive;

diff --git a/lld/test/ELF/duplicated-synthetic-sym.s b/lld/test/ELF/duplicated-synthetic-sym.s
@@ -4,7 +4,7 @@
 // RUN: not ld.lld %t.o --format binary duplicated-synthetic-sym.s -o %t.elf 2>&1 | FileCheck %s
 
 // CHECK: duplicate symbol: _binary_duplicated_synthetic_sym_s_start
-// CHECK: defined at (internal):(.data+0x0)
+// CHECK: defined at <internal>:(.data+0x0)
 
     .globl  _binary_duplicated_synthetic_sym_s_start
 _binary_duplicated_synthetic_sym_s_start:

diff --git a/lld/wasm/SymbolTable.cpp b/lld/wasm/SymbolTable.cpp
@@ -73,7 +73,7 @@ std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name) {
 void SymbolTable::reportDuplicate(Symbol *Existing, InputFile *NewFile) {
   error("duplicate symbol: " + toString(*Existing) + "\n>>> defined in " +
         toString(Existing->getFile()) + "\n>>> defined in " +
-        (NewFile ? toString(NewFile) : "<internal>"));
+        toString(NewFile));
 }
 
 static void checkSymbolTypes(Symbol *Existing, InputFile *F,
@@ -86,13 +86,10 @@ static void checkSymbolTypes(Symbol *Existing, InputFile *F,
   if (Existing->isFunction() == NewIsFunction)
     return;
 
-  std::string Filename = "<builtin>";
-  if (Existing->getFile())
-    Filename = toString(Existing->getFile());
   error("symbol type mismatch: " + New->Name + "\n>>> defined as " +
-        (Existing->isFunction() ? "Function" : "Global") + " in " + Filename +
-        "\n>>> defined as " + (NewIsFunction ? "Function" : "Global") + " in " +
-        F->getName());
+        (Existing->isFunction() ? "Function" : "Global") + " in " +
+        toString(Existing->getFile()) + "\n>>> defined as " +
+        (NewIsFunction ? "Function" : "Global") + " in " + F->getName());
 }
 
 Symbol *SymbolTable::addDefinedGlobal(StringRef Name) {