[WebAssembly] llvm-readobj: display symbols names in relocations

[sbc100]

• cleanup

[sbc100]

• remove braces:

test/MC/WebAssembly/debug-info.ll

 ; CHECK-NEXT:    Type: CUSTOM (0x0)
 ; CHECK-NEXT:    Size: 6
 ; CHECK-NEXT:    Offset: 1023
 ; CHECK-NEXT:    Name: reloc..debug_line
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:]
 ; CHECK-NEXT:Relocations [
 ; CHECK-NEXT:  Section (6) DATA {
-; CHECK-NEXT:    0x6 R_WEBASSEMBLY_MEMORY_ADDR_I32[10] 0
-; CHECK-NEXT:    0xF R_WEBASSEMBLY_TABLE_INDEX_I32[8]
+; CHECK-NEXT:    0x6 R_WEBASSEMBLY_MEMORY_ADDR_I32 myextern 0
+; CHECK-NEXT:    0xF R_WEBASSEMBLY_TABLE_INDEX_I32 f2
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:  Section (9) .debug_info {
-; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32[1] 0
-; CHECK-NEXT:    0xC R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 0
-; CHECK-NEXT:    0x12 R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 55
-; CHECK-NEXT:    0x16 R_WEBASSEMBLY_SECTION_OFFSET_I32[7] 0
-; CHECK-NEXT:    0x1A R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 62
-; CHECK-NEXT:    0x1E R_WEBASSEMBLY_FUNCTION_OFFSET_I32[8] 0
-; CHECK-NEXT:    0x27 R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 105
-; CHECK-NEXT:    0x33 R_WEBASSEMBLY_MEMORY_ADDR_I32[9] 0
-; CHECK-NEXT:    0x3D R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 109
-; CHECK-NEXT:    0x44 R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 113
-; CHECK-NEXT:    0x50 R_WEBASSEMBLY_MEMORY_ADDR_I32[11] 0
-; CHECK-NEXT:    0x5B R_WEBASSEMBLY_FUNCTION_OFFSET_I32[8] 0
-; CHECK-NEXT:    0x63 R_WEBASSEMBLY_SECTION_OFFSET_I32[0] 118
+; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_abbrev 0
+; CHECK-NEXT:    0xC R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 0
+; CHECK-NEXT:    0x12 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 55
+; CHECK-NEXT:    0x16 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_line 0
+; CHECK-NEXT:    0x1A R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 62
+; CHECK-NEXT:    0x1E R_WEBASSEMBLY_FUNCTION_OFFSET_I32 f2 0
+; CHECK-NEXT:    0x27 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 105
+; CHECK-NEXT:    0x33 R_WEBASSEMBLY_MEMORY_ADDR_I32 foo 0
+; CHECK-NEXT:    0x3D R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 109
+; CHECK-NEXT:    0x44 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 113
+; CHECK-NEXT:    0x50 R_WEBASSEMBLY_MEMORY_ADDR_I32 ptr2 0
+; CHECK-NEXT:    0x5B R_WEBASSEMBLY_FUNCTION_OFFSET_I32 f2 0
+; CHECK-NEXT:    0x63 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_str 118
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:  Section (12) .debug_pubnames {
-; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32[2] 0
+; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_info 0
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:  Section (13) .debug_pubtypes {
-; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32[2] 0
+; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32 .debug_info 0
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:  Section (14) .debug_line {
-; CHECK-NEXT:    0x2B R_WEBASSEMBLY_FUNCTION_OFFSET_I32[8] 0
+; CHECK-NEXT:    0x2B R_WEBASSEMBLY_FUNCTION_OFFSET_I32 f2 0
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:]
 ; CHECK-NEXT:Symbols [
 ; CHECK-NEXT:  Symbol {
 ; CHECK-NEXT:    Name: .debug_str
 ; CHECK-NEXT:    Type: SECTION (0x3)
 ; CHECK-NEXT:    Flags: 0x2
 ; CHECK-NEXT:  }

test/MC/WebAssembly/func-address.ll

 ; function.
 define hidden void @call_indirect() #0 {
 entry:
   %adr = alloca i32 ()*, align 4
   store i32 ()* @import3, i32 ()** %adr, align 4
   ret void
 }
 
-; CHECK:   Section {
-; CHECK:     Type: ELEM (0x9)
-; CHECK:     Size: 7
-; CHECK:   }
+; CHECK:          Type: ELEM (0x9)
+; CHECK-NEXT:     Size: 7
 
-; CHECK: Relocations [
-; CHECK:   Section (5) CODE {
-; CHECK:     Relocation {
-; CHECK:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
-; CHECK:       Offset: 0x4
-; CHECK:       Index: 0x1
-; CHECK:     }
-; CHECK:     Relocation {
-; CHECK:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
-; CHECK:       Offset: 0xB
-; CHECK:       Index: 0x2
-; CHECK:     }
-; CHECK:     Relocation {
-; CHECK:       Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB (1)
-; CHECK:       Offset: 0x1E
-; CHECK:       Index: 0x5
-; CHECK:     }
-; CHECK:   }
+; CHECK:      Relocations [
+; CHECK-NEXT:   Section (5) CODE {
+; CHECK-NEXT:     Relocation {
+; CHECK-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
+; CHECK-NEXT:       Offset: 0x4
+; CHECK-NEXT:       Symbol: import1
+; CHECK-NEXT:     }
+; CHECK-NEXT:     Relocation {
+; CHECK-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
+; CHECK-NEXT:       Offset: 0xB
+; CHECK-NEXT:       Symbol: import2
+; CHECK-NEXT:     }
+; CHECK-NEXT:     Relocation {
+; CHECK-NEXT:       Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB (7)
+; CHECK-NEXT:       Offset: 0x15
+; CHECK-NEXT:       Symbol: __stack_pointer
+; CHECK-NEXT:     }
+; CHECK-NEXT:     Relocation {
+; CHECK-NEXT:       Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB (1)
+; CHECK-NEXT:       Offset: 0x1E
+; CHECK-NEXT:       Symbol: import3
+; CHECK-NEXT:     }
+; CHECK-NEXT:   }
+; CHECK-NEXT: ]

test/MC/WebAssembly/reloc-code.ll

 
 
 ; CHECK: Format: WASM
 ; CHECK: Relocations [
 ; CHECK-NEXT:   Section (4) CODE {
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB (3)
 ; CHECK-NEXT:       Offset: 0x9
-; CHECK-NEXT:       Index: 0x1
+; CHECK-NEXT:       Symbol: b
 ; CHECK-NEXT:       Addend: 0
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB (3)
 ; CHECK-NEXT:       Offset: 0x14
-; CHECK-NEXT:       Index: 0x2
+; CHECK-NEXT:       Symbol: a
 ; CHECK-NEXT:       Addend: 0
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_TYPE_INDEX_LEB (6)
 ; CHECK-NEXT:       Offset: 0x1A
 ; CHECK-NEXT:       Index: 0x1
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_TYPE_INDEX_LEB (6)
 ; CHECK-NEXT:       Offset: 0x24
 ; CHECK-NEXT:       Index: 0x0
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 ; CHECK-NEXT:       Offset: 0x2D
-; CHECK-NEXT:       Index: 0x3
+; CHECK-NEXT:       Symbol: c
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 ; CHECK-NEXT:       Offset: 0x34
-; CHECK-NEXT:       Index: 0x4
+; CHECK-NEXT:       Symbol: d
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:   }
 ; CHECK-NEXT: ]

test/MC/WebAssembly/reloc-data.ll

 @c = global [3 x i32*] [i32* @foo, i32* @foo, i32* @foo], align 16
 
 ; CHECK:      Format: WASM
 ; CHECK:      Relocations [
 ; CHECK-NEXT:   Section (2) DATA {
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 (5)
 ; CHECK-NEXT:       Offset: 0x13
-; CHECK-NEXT:       Index: 0x2
+; CHECK-NEXT:       Symbol: foo
 ; CHECK-NEXT:       Addend: 8
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 (5)
 ; CHECK-NEXT:       Offset: 0x1C
-; CHECK-NEXT:       Index: 0x0
+; CHECK-NEXT:       Symbol: bar
 ; CHECK-NEXT:       Addend: -16
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 (5)
 ; CHECK-NEXT:       Offset: 0x25
-; CHECK-NEXT:       Index: 0x2
+; CHECK-NEXT:       Symbol: foo
 ; CHECK-NEXT:       Addend: 0
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 (5)
 ; CHECK-NEXT:       Offset: 0x29
-; CHECK-NEXT:       Index: 0x2
+; CHECK-NEXT:       Symbol: foo
 ; CHECK-NEXT:       Addend: 0
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:     Relocation {
 ; CHECK-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 (5)
 ; CHECK-NEXT:       Offset: 0x2D
-; CHECK-NEXT:       Index: 0x2
+; CHECK-NEXT:       Symbol: foo
 ; CHECK-NEXT:       Addend: 0
 ; CHECK-NEXT:     }
 ; CHECK-NEXT:   }
 ; CHECK-NEXT: ]

test/tools/llvm-readobj/relocations.test

 MACHO-ARM-NEXT:    }
 MACHO-ARM-NEXT:  ]
 
 WASM:      Relocations [
 WASM-NEXT:   Section (4) CODE {
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB (4)
 WASM-NEXT:       Offset: 0x4
-WASM-NEXT:       Index: 0x1
+WASM-NEXT:       Symbol: .L.str
 WASM-NEXT:       Addend: 0
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0xA
-WASM-NEXT:       Index: 0x2
+WASM-NEXT:       Symbol: puts
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0x11
-WASM-NEXT:       Index: 0x3
+WASM-NEXT:       Symbol: SomeOtherFunction
 WASM-NEXT:     }
 WASM-NEXT:   }
 WASM-NEXT: ]

tools/llvm-readobj/WasmDumper.cpp

 
 void WasmDumper::printRelocation(const SectionRef &Section,
                                  const RelocationRef &Reloc) {
   SmallString<64> RelocTypeName;
   uint64_t RelocType = Reloc.getType();
   Reloc.getTypeName(RelocTypeName);
   const wasm::WasmRelocation &WasmReloc = Obj->getWasmRelocation(Reloc);
 
+  StringRef SymName;
+  symbol_iterator SI = Reloc.getSymbol();
+  if (SI != Obj->symbol_end()) {
+    Expected<StringRef> SymNameOrErr = SI->getName();
+    if (!SymNameOrErr)
+      report_fatal_error("Error reading symbol name");
+    SymName = *SymNameOrErr;
+  }
+
   bool HasAddend = false;
   switch (RelocType) {
   case wasm::R_WEBASSEMBLY_MEMORY_ADDR_LEB:
   case wasm::R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
   case wasm::R_WEBASSEMBLY_MEMORY_ADDR_I32:
   case wasm::R_WEBASSEMBLY_FUNCTION_OFFSET_I32:
   case wasm::R_WEBASSEMBLY_SECTION_OFFSET_I32:
     HasAddend = true;
     break;
   default:
     break;
   }
   if (opts::ExpandRelocs) {
     DictScope Group(W, "Relocation");
     W.printNumber("Type", RelocTypeName, RelocType);
     W.printHex("Offset", Reloc.getOffset());
+    if (!SymName.empty())
+      W.printString("Symbol", SymName);
+    else
       W.printHex("Index", WasmReloc.Index);
     if (HasAddend)
       W.printNumber("Addend", WasmReloc.Addend);
   } else {
     raw_ostream& OS = W.startLine();
-    OS << W.hex(Reloc.getOffset()) << " " << RelocTypeName << "["
-       << WasmReloc.Index << "]";
+    OS << W.hex(Reloc.getOffset()) << " " << RelocTypeName << " ";
+    if (!SymName.empty())
+      OS << SymName;
+    else
+      OS << WasmReloc.Index;
     if (HasAddend)
       OS << " " << WasmReloc.Addend;
     OS << "\n";
   }
 }
 
 void WasmDumper::printRelocations() {
   ListScope D(W, "Relocations");