[lld] r322921 - [WebAssembly] Fix variable whose name is also a type name
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Thu Jan 18 19:31:07 PST 2018
Author: sbc
Date: Thu Jan 18 19:31:07 2018
New Revision: 322921
URL: http://llvm.org/viewvc/llvm-project?rev=322921&view=rev
Log:
[WebAssembly] Fix variable whose name is also a type name
Some compilers don't like this and generate a warning.
Modified:
lld/trunk/wasm/Writer.cpp
Modified: lld/trunk/wasm/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Writer.cpp?rev=322921&r1=322920&r2=322921&view=diff
==============================================================================
--- lld/trunk/wasm/Writer.cpp (original)
+++ lld/trunk/wasm/Writer.cpp Thu Jan 18 19:31:07 2018
@@ -64,7 +64,7 @@ struct WasmSignatureDenseMapInfo {
// A Wasm export to be written into the export section.
struct WasmExportEntry {
- const Symbol *Symbol;
+ const Symbol *Sym;
StringRef FieldName; // may not match the Symbol name
};
@@ -286,11 +286,11 @@ void Writer::createExportSection() {
}
for (const WasmExportEntry &E : ExportedSymbols) {
- DEBUG(dbgs() << "Export: " << E.Symbol->getName() << "\n");
+ DEBUG(dbgs() << "Export: " << E.Sym->getName() << "\n");
WasmExport Export;
Export.Name = E.FieldName;
- Export.Index = E.Symbol->getOutputIndex();
- if (E.Symbol->isFunction())
+ Export.Index = E.Sym->getOutputIndex();
+ if (E.Sym->isFunction())
Export.Kind = WASM_EXTERNAL_FUNCTION;
else
Export.Kind = WASM_EXTERNAL_GLOBAL;
@@ -388,9 +388,9 @@ void Writer::createLinkingSection() {
std::vector<std::pair<StringRef, uint32_t>> SymbolInfo;
for (const WasmExportEntry &E : ExportedSymbols) {
uint32_t Flags =
- (E.Symbol->isLocal() ? WASM_SYMBOL_BINDING_LOCAL :
- E.Symbol->isWeak() ? WASM_SYMBOL_BINDING_WEAK : 0) |
- (E.Symbol->isHidden() ? WASM_SYMBOL_VISIBILITY_HIDDEN : 0);
+ (E.Sym->isLocal() ? WASM_SYMBOL_BINDING_LOCAL :
+ E.Sym->isWeak() ? WASM_SYMBOL_BINDING_WEAK : 0) |
+ (E.Sym->isHidden() ? WASM_SYMBOL_VISIBILITY_HIDDEN : 0);
if (Flags)
SymbolInfo.emplace_back(E.FieldName, Flags);
}
More information about the llvm-commits
mailing list