[WebAssembly] Section symbols must have local binding

[sbc100]

Summary

Also test for symbols information in test/MC/WebAssembly/debug-info.ll.

[sbc100]

• typo

llvm/trunk/lib/MC/WasmObjectWriter.cpp

for (MCSection &Sec : Asm) {
 
     MCSymbolWasm *SectionSym =
         cast<MCSymbolWasm>(Ctx.getOrCreateSymbol(SectionName));
     CustomSectionSymbols[SectionSym] = &DebugSection;
 
     wasm::WasmSymbolInfo Info;
     Info.Name = SectionSym->getName();
     Info.Kind = wasm::WASM_SYMBOL_TYPE_SECTION;
-    Info.Flags = 0;
+    Info.Flags = wasm::WASM_SYMBOL_BINDING_LOCAL;
     Info.ElementIndex = ElementIndex;
     SymbolIndices[SectionSym] = SymbolInfos.size();
     SymbolInfos.emplace_back(Info);
   }
 
   // Populate WasmIndices and DataLocations for defined symbols.
   for (const MCSymbol &S : Asm.symbols()) {
     // Ignore unnamed temporary symbols, which aren't ever exported, imported,

llvm/trunk/lib/Object/WasmObjectFile.cpp

case wasm::WASM_SYMBOL_TYPE_DATA:
         if (Offset + Size > DataSegments[Index].Data.Content.size())
           return make_error<GenericBinaryError>("invalid data symbol offset",
                                                 object_error::parse_failed);
         Info.DataRef = wasm::WasmDataReference{Index, Offset, Size};
       }
       break;
 
     case wasm::WASM_SYMBOL_TYPE_SECTION: {
+      if ((Info.Flags & wasm::WASM_SYMBOL_BINDING_MASK) !=
+          wasm::WASM_SYMBOL_BINDING_LOCAL)
+        return make_error<GenericBinaryError>("Section symbol must have local binding",
+                                              object_error::parse_failed);
       Info.ElementIndex = readVaruint32(Ptr);
       // Use somewhat unique section name as symbol name.
       StringRef SectionName = Sections[Info.ElementIndex].Name;
       Info.Name = SectionName;
       break;
     }
 
     default:

llvm/trunk/test/MC/WebAssembly/debug-info.ll

-; RUN: llc -filetype=obj %s -o - | llvm-readobj -r -s | FileCheck %s
+; RUN: llc -filetype=obj %s -o - | llvm-readobj -r -s -symbols | FileCheck %s
 
 ; CHECK: Format: WASM
 ; CHECK-NEXT:Arch: wasm32
 ; CHECK-NEXT:AddressSize: 32bit
 ; CHECK-NEXT:Sections [
 ; CHECK-NEXT:  Section {
 ; CHECK-NEXT:    Type: TYPE (0x1)
 ; CHECK-NEXT:    Size: 4

 ; CHECK-NEXT:  }
 ; CHECK-NEXT:  Section (13) .debug_pubtypes {
 ; CHECK-NEXT:    0x6 R_WEBASSEMBLY_SECTION_OFFSET_I32[2] 0
 ; CHECK-NEXT:  }
 ; CHECK-NEXT:  Section (14) .debug_line {
 ; CHECK-NEXT:    0x2B R_WEBASSEMBLY_FUNCTION_OFFSET_I32[8] 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:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_abbrev
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_info
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_ranges
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_macinfo
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_pubnames
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_pubtypes
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: .debug_line
+; CHECK-NEXT:    Type: SECTION (0x3)
+; CHECK-NEXT:    Flags: 0x2
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: f2
+; CHECK-NEXT:    Type: FUNCTION (0x0)
+; CHECK-NEXT:    Flags: 0x4
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: foo
+; CHECK-NEXT:    Type: DATA (0x1)
+; CHECK-NEXT:    Flags: 0x4
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: myextern
+; CHECK-NEXT:    Type: DATA (0x1)
+; CHECK-NEXT:    Flags: 0x10
+; CHECK-NEXT:  }
+; CHECK-NEXT:  Symbol {
+; CHECK-NEXT:    Name: ptr2
+; CHECK-NEXT:    Type: DATA (0x1)
+; CHECK-NEXT:    Flags: 0x4
+; CHECK-NEXT:  }
+; CHECK-NEXT:]
 
 target triple = "wasm32-unknown-unknown-wasm"
 
 source_filename = "test.c"
 
 @myextern = external global i32, align 4
 @foo = hidden global i32* @myextern, align 4, !dbg !0
 @ptr2 = hidden global void ()* @f2, align 4, !dbg !6

llvm/trunk/tools/llvm-readobj/WasmDumper.cpp

 
 namespace {
 
 static const EnumEntry<unsigned> WasmSymbolTypes[] = {
 #define ENUM_ENTRY(X) { #X, wasm::WASM_SYMBOL_TYPE_##X }
   ENUM_ENTRY(FUNCTION),
   ENUM_ENTRY(DATA),
   ENUM_ENTRY(GLOBAL),
+  ENUM_ENTRY(SECTION),
 #undef ENUM_ENTRY
 };
 
 static const EnumEntry<uint32_t> WasmSectionTypes[] = {
 #define ENUM_ENTRY(X) { #X, wasm::WASM_SEC_##X }
   ENUM_ENTRY(CUSTOM),
   ENUM_ENTRY(TYPE),
   ENUM_ENTRY(IMPORT),