[llvm] r331005 - [WebAssembly] Section symbols must have local binding
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 26 17:17:22 PDT 2018
Author: sbc
Date: Thu Apr 26 17:17:21 2018
New Revision: 331005
URL: http://llvm.org/viewvc/llvm-project?rev=331005&view=rev
Log:
[WebAssembly] Section symbols must have local binding
Summary: Also test for symbols information in test/MC/WebAssembly/debug-info.ll.
Subscribers: jfb, dschuff, jgravelle-google, aheejin, sunfish, JDevlieghere, llvm-commits
Differential Revision: https://reviews.llvm.org/D46160
Modified:
llvm/trunk/lib/MC/WasmObjectWriter.cpp
llvm/trunk/lib/Object/WasmObjectFile.cpp
llvm/trunk/test/MC/WebAssembly/debug-info.ll
llvm/trunk/test/Object/Inputs/trivial-object-test.wasm
llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
llvm/trunk/tools/llvm-readobj/WasmDumper.cpp
Modified: llvm/trunk/lib/MC/WasmObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WasmObjectWriter.cpp?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
--- llvm/trunk/lib/MC/WasmObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/WasmObjectWriter.cpp Thu Apr 26 17:17:21 2018
@@ -1220,7 +1220,7 @@ void WasmObjectWriter::writeObject(MCAss
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);
Modified: llvm/trunk/lib/Object/WasmObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/WasmObjectFile.cpp?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
--- llvm/trunk/lib/Object/WasmObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/WasmObjectFile.cpp Thu Apr 26 17:17:21 2018
@@ -466,6 +466,10 @@ Error WasmObjectFile::parseLinkingSectio
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;
Modified: llvm/trunk/test/MC/WebAssembly/debug-info.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/WebAssembly/debug-info.ll?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
--- llvm/trunk/test/MC/WebAssembly/debug-info.ll (original)
+++ llvm/trunk/test/MC/WebAssembly/debug-info.ll Thu Apr 26 17:17:21 2018
@@ -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"
Modified: llvm/trunk/test/Object/Inputs/trivial-object-test.wasm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/trivial-object-test.wasm?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
Binary files llvm/trunk/test/Object/Inputs/trivial-object-test.wasm (original) and llvm/trunk/test/Object/Inputs/trivial-object-test.wasm Thu Apr 26 17:17:21 2018 differ
Modified: llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
Binary files llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm (original) and llvm/trunk/test/tools/llvm-objdump/Inputs/trivial.obj.wasm Thu Apr 26 17:17:21 2018 differ
Modified: llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
Binary files llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm (original) and llvm/trunk/test/tools/llvm-readobj/Inputs/trivial.obj.wasm Thu Apr 26 17:17:21 2018 differ
Modified: llvm/trunk/tools/llvm-readobj/WasmDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/WasmDumper.cpp?rev=331005&r1=331004&r2=331005&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/WasmDumper.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/WasmDumper.cpp Thu Apr 26 17:17:21 2018
@@ -27,6 +27,7 @@ static const EnumEntry<unsigned> WasmSym
ENUM_ENTRY(FUNCTION),
ENUM_ENTRY(DATA),
ENUM_ENTRY(GLOBAL),
+ ENUM_ENTRY(SECTION),
#undef ENUM_ENTRY
};
More information about the llvm-commits
mailing list