Index: llvm/trunk/lib/MC/WasmObjectWriter.cpp =================================================================== --- llvm/trunk/lib/MC/WasmObjectWriter.cpp +++ llvm/trunk/lib/MC/WasmObjectWriter.cpp @@ -291,8 +291,6 @@ void writeCodeSection(const MCAssembler &Asm, const MCAsmLayout &Layout, ArrayRef Functions); void writeDataSection(ArrayRef Segments); - void writeNameSection(ArrayRef Functions, - ArrayRef Imports); void writeCodeRelocSection(); void writeDataRelocSection(); void writeLinkingMetaDataSection( @@ -851,36 +849,6 @@ endSection(Section); } -void WasmObjectWriter::writeNameSection(ArrayRef Functions, - ArrayRef Imports) { - uint32_t TotalFunctions = NumFunctionImports + Functions.size(); - if (TotalFunctions == 0) - return; - - SectionBookkeeping Section; - startSection(Section, wasm::WASM_SEC_CUSTOM, "name"); - SectionBookkeeping SubSection; - startSection(SubSection, wasm::WASM_NAMES_FUNCTION); - - encodeULEB128(TotalFunctions, getStream()); - uint32_t Index = 0; - for (const WasmImport &Import : Imports) { - if (Import.Kind == wasm::WASM_EXTERNAL_FUNCTION) { - encodeULEB128(Index, getStream()); - writeString(Import.FieldName); - ++Index; - } - } - for (const WasmFunction &Func : Functions) { - encodeULEB128(Index, getStream()); - writeString(Func.Sym->getName()); - ++Index; - } - - endSection(SubSection); - endSection(Section); -} - void WasmObjectWriter::writeCodeRelocSection() { // See: https://github.com/WebAssembly/tool-conventions/blob/master/Linking.md // for descriptions of the reloc sections. @@ -1405,7 +1373,6 @@ writeElemSection(TableElems); writeCodeSection(Asm, Layout, Functions); writeDataSection(DataSegments); - writeNameSection(Functions, Imports); writeCodeRelocSection(); writeDataRelocSection(); writeLinkingMetaDataSection(DataSegments, DataSize, SymbolFlags, Index: llvm/trunk/test/MC/WebAssembly/comdat.ll =================================================================== --- llvm/trunk/test/MC/WebAssembly/comdat.ll +++ llvm/trunk/test/MC/WebAssembly/comdat.ll @@ -94,17 +94,6 @@ ; CHECK-NEXT: Value: 0 ; CHECK-NEXT: Content: '616263' ; CHECK-NEXT: - Type: CUSTOM -; CHECK-NEXT: Name: name -; CHECK-NEXT: FunctionNames: -; CHECK-NEXT: - Index: 0 -; CHECK-NEXT: Name: funcImport -; CHECK-NEXT: - Index: 1 -; CHECK-NEXT: Name: callImport -; CHECK-NEXT: - Index: 2 -; CHECK-NEXT: Name: basicInlineFn -; CHECK-NEXT: - Index: 3 -; CHECK-NEXT: Name: sharedFn -; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: Name: linking ; CHECK-NEXT: DataSize: 3 ; CHECK-NEXT: SymbolInfo: Index: llvm/trunk/test/MC/WebAssembly/global-ctor-dtor.ll =================================================================== --- llvm/trunk/test/MC/WebAssembly/global-ctor-dtor.ll +++ llvm/trunk/test/MC/WebAssembly/global-ctor-dtor.ll @@ -137,27 +137,6 @@ ; CHECK-NEXT: Value: 0 ; CHECK-NEXT: Content: '01040000' ; CHECK-NEXT: - Type: CUSTOM -; CHECK-NEXT: Name: name -; CHECK-NEXT: FunctionNames: -; CHECK-NEXT: - Index: 0 -; CHECK-NEXT: Name: func3 -; CHECK-NEXT: - Index: 1 -; CHECK-NEXT: Name: __cxa_atexit -; CHECK-NEXT: - Index: 2 -; CHECK-NEXT: Name: func2 -; CHECK-NEXT: - Index: 3 -; CHECK-NEXT: Name: func1 -; CHECK-NEXT: - Index: 4 -; CHECK-NEXT: Name: func0 -; CHECK-NEXT: - Index: 5 -; CHECK-NEXT: Name: .Lcall_dtors.42 -; CHECK-NEXT: - Index: 6 -; CHECK-NEXT: Name: .Lregister_call_dtors.42 -; CHECK-NEXT: - Index: 7 -; CHECK-NEXT: Name: .Lcall_dtors -; CHECK-NEXT: - Index: 8 -; CHECK-NEXT: Name: .Lregister_call_dtors -; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: Name: linking ; CHECK-NEXT: DataSize: 4 ; CHECK-NEXT: SymbolInfo: Index: llvm/trunk/test/MC/WebAssembly/sections.ll =================================================================== --- llvm/trunk/test/MC/WebAssembly/sections.ll +++ llvm/trunk/test/MC/WebAssembly/sections.ll @@ -41,10 +41,6 @@ ; CHECK: } ; CHECK: Section { ; CHECK: Type: CUSTOM (0x0) -; CHECK: Name: name -; CHECK: } -; CHECK: Section { -; CHECK: Type: CUSTOM (0x0) ; CHECK: Name: reloc.CODE ; CHECK: } ; CHECK:] Index: llvm/trunk/test/MC/WebAssembly/visibility.ll =================================================================== --- llvm/trunk/test/MC/WebAssembly/visibility.ll +++ llvm/trunk/test/MC/WebAssembly/visibility.ll @@ -13,8 +13,6 @@ } ; CHECK: - Type: CUSTOM - -; CHECK: - Type: CUSTOM ; CHECK-NEXT: Name: linking ; CHECK-NEXT: DataSize: 0 ; CHECK-NEXT: SymbolInfo: Index: llvm/trunk/test/MC/WebAssembly/weak-alias.ll =================================================================== --- llvm/trunk/test/MC/WebAssembly/weak-alias.ll +++ llvm/trunk/test/MC/WebAssembly/weak-alias.ll @@ -191,21 +191,6 @@ ; CHECK-NEXT: Content: '01000000' ; CHECK: - Type: CUSTOM -; CHECK-NEXT: Name: name -; CHECK-NEXT: FunctionNames: -; CHECK-NEXT: - Index: 0 -; CHECK-NEXT: Name: foo_alias -; CHECK-NEXT: - Index: 1 -; CHECK-NEXT: Name: foo -; CHECK-NEXT: - Index: 2 -; CHECK-NEXT: Name: call_direct -; CHECK-NEXT: - Index: 3 -; CHECK-NEXT: Name: call_alias -; CHECK-NEXT: - Index: 4 -; CHECK-NEXT: Name: call_direct_ptr -; CHECK-NEXT: - Index: 5 -; CHECK-NEXT: Name: call_alias_ptr -; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: Name: linking ; CHECK-NEXT: DataSize: 20 ; CHECK-NEXT: SymbolInfo: Index: llvm/trunk/test/MC/WebAssembly/weak.ll =================================================================== --- llvm/trunk/test/MC/WebAssembly/weak.ll +++ llvm/trunk/test/MC/WebAssembly/weak.ll @@ -24,11 +24,6 @@ ; CHECK: - Type: CUSTOM -; CHECK-NEXT: Name: name -; CHECK-NEXT: FunctionNames: -; CHECK-NEXT: - Index: 0 -; CHECK-NEXT: Name: weak_function -; CHECK-NEXT: - Type: CUSTOM ; CHECK-NEXT: Name: linking ; CHECK-NEXT: DataSize: 0 ; CHECK-NEXT: SymbolInfo: