diff options
| author | Heejin Ahn <aheejin@gmail.com> | 2017-12-02 02:05:06 +0000 |
|---|---|---|
| committer | Heejin Ahn <aheejin@gmail.com> | 2017-12-02 02:05:06 +0000 |
| commit | e74a864cec4bf4db666a6547a32be7076e1406bf (patch) | |
| tree | 85e8e757847cd4b32d2d0b72d2cdd50fd8e74aac /llvm/lib | |
| parent | a22d9a5c51cac42f61351ea13fd296f136f827c6 (diff) | |
| download | bcm5719-llvm-e74a864cec4bf4db666a6547a32be7076e1406bf.tar.gz bcm5719-llvm-e74a864cec4bf4db666a6547a32be7076e1406bf.zip | |
[WebAssembly] Revert r319488 "Add visibility flag to Wasm symbol flags"
This patch reportedly broke one of LLVM bots (ubuntu-gcc7.1-werror).
See http://lab.llvm.org:8011/builders/ubuntu-gcc7.1-werror/builds/3369 for
details.
llvm-svn: 319602
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCWasmStreamer.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/MC/WasmObjectWriter.cpp | 8 | ||||
| -rw-r--r-- | llvm/lib/Object/WasmObjectFile.cpp | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/llvm/lib/MC/MCWasmStreamer.cpp b/llvm/lib/MC/MCWasmStreamer.cpp index ef2a5621512..287b7cf7b23 100644 --- a/llvm/lib/MC/MCWasmStreamer.cpp +++ b/llvm/lib/MC/MCWasmStreamer.cpp @@ -98,13 +98,10 @@ bool MCWasmStreamer::EmitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) { case MCSA_WeakDefAutoPrivate: case MCSA_Invalid: case MCSA_IndirectSymbol: + case MCSA_Hidden: case MCSA_Protected: return false; - case MCSA_Hidden: - Symbol->setHidden(true); - break; - case MCSA_Weak: case MCSA_WeakReference: Symbol->setWeak(true); diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp index 42521ac72e2..6e9088b9d0d 100644 --- a/llvm/lib/MC/WasmObjectWriter.cpp +++ b/llvm/lib/MC/WasmObjectWriter.cpp @@ -1180,14 +1180,10 @@ void WasmObjectWriter::writeObject(MCAssembler &Asm, << S.isExternal() << " isTemporary=" << S.isTemporary() << " isFunction=" << WS.isFunction() << " isWeak=" << WS.isWeak() - << " isHidden=" << WS.isHidden() << " isVariable=" << WS.isVariable() << "\n"); - if (WS.isWeak() || WS.isHidden()) { - uint32_t Flags = (WS.isWeak() ? wasm::WASM_SYMBOL_BINDING_WEAK : 0) | - (WS.isHidden() ? wasm::WASM_SYMBOL_VISIBILITY_HIDDEN : 0); - SymbolFlags.emplace_back(WS.getName(), Flags); - } + if (WS.isWeak()) + SymbolFlags.emplace_back(WS.getName(), wasm::WASM_SYMBOL_BINDING_WEAK); if (WS.isVariable()) continue; diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp index 70ac598b897..86ce9c2209c 100644 --- a/llvm/lib/Object/WasmObjectFile.cpp +++ b/llvm/lib/Object/WasmObjectFile.cpp @@ -378,7 +378,7 @@ Error WasmObjectFile::parseLinkingSection(const uint8_t *Ptr, Symbols[SymIndex].Flags = Flags; DEBUG(dbgs() << "Set symbol flags index:" << SymIndex << " name:" - << Symbols[SymIndex].Name << " expected:" + << Symbols[SymIndex].Name << " exptected:" << Symbol << " flags: " << Flags << "\n"); } break; @@ -766,8 +766,6 @@ uint32_t WasmObjectFile::getSymbolFlags(DataRefImpl Symb) const { Result |= SymbolRef::SF_Weak; if (!Sym.isLocal()) Result |= SymbolRef::SF_Global; - if (Sym.isHidden()) - Result |= SymbolRef::SF_Hidden; switch (Sym.Type) { case WasmSymbol::SymbolType::FUNCTION_IMPORT: |
