llvm · Apr 27, 2018
diff --git a/‎llvm/lib/MC/WasmObjectWriter.cpp
+1-1 b/‎llvm/lib/MC/WasmObjectWriter.cpp
+1-1
diff --git a/‎llvm/lib/Object/WasmObjectFile.cpp
+4 b/‎llvm/lib/Object/WasmObjectFile.cpp
+4
diff --git a/‎llvm/test/MC/WebAssembly/debug-info.ll
+63-1 b/‎llvm/test/MC/WebAssembly/debug-info.ll
+63-1
diff --git a/‎llvm/test/Object/Inputs/trivial-object-test.wasm
-3 Bytes b/‎llvm/test/Object/Inputs/trivial-object-test.wasm
-3 Bytes
diff --git a/‎llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
-3 Bytes b/‎llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
-3 Bytes
diff --git a/‎llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
-3 Bytes b/‎llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
-3 Bytes
diff --git a/‎llvm/tools/llvm-readobj/WasmDumper.cpp
+1 b/‎llvm/tools/llvm-readobj/WasmDumper.cpp
+1
@@ -1220,7 +1220,7 @@ void WasmObjectWriter::writeObject(MCAssembler &Asm,
     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);
 
@@ -466,6 +466,10 @@ Error WasmObjectFile::parseLinkingSectionSymtab(const uint8_t *&Ptr,
       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;
 
@@ -1,4 +1,4 @@
-; 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
@@ -161,6 +161,68 @@
 ; 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"
 
 
@@ -27,6 +27,7 @@ static const EnumEntry<unsigned> WasmSymbolTypes[] = {
   ENUM_ENTRY(FUNCTION),
   ENUM_ENTRY(DATA),
   ENUM_ENTRY(GLOBAL),
+  ENUM_ENTRY(SECTION),
 #undef ENUM_ENTRY
 };