This is an archive of the discontinued LLVM Phabricator instance.

Differential D43710

[WebAssembly] Use more specific type and simplify code.
ClosedPublic

Authored by ruiu on Feb 23 2018, 6:28 PM.

Details

Reviewers
sbc100
Commits
rG7d696880fbb3: [WebAssembly] Use more specific type and simplify code.
rLLD326275: [WebAssembly] Use more specific type and simplify code.
rL326275: [WebAssembly] Use more specific type and simplify code.
Summary

Instead of {Function,Global,Data}Symbol, use Defined{Function,Global,Data}
because undefined symbol should never reach this function.

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

ruiu created this revision.Feb 23 2018, 6:28 PM
Herald added subscribers: sunfish, aheejin, jgravelle-google and 2 others. · View Herald TranscriptFeb 23 2018, 6:28 PM
Harbormaster completed remote builds in B15388: Diff 135761.Feb 23 2018, 6:29 PM
ruiu updated this revision to Diff 135762.Feb 23 2018, 6:30 PM
  • simplify
Harbormaster completed remote builds in B15389: Diff 135762.Feb 23 2018, 6:30 PM
sbc100 accepted this revision.Feb 27 2018, 3:45 PM
This revision is now accepted and ready to land.Feb 27 2018, 3:45 PM
Closed by commit rL326275: [WebAssembly] Use more specific type and simplify code. (authored by ruiu). · Explain WhyFeb 27 2018, 4:20 PM
Closed by commit rLLD326275: [WebAssembly] Use more specific type and simplify code. (authored by ruiu). · Explain Why
This revision was automatically updated to reflect the committed changes.
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
wasm/
33 lines

Diff 136177

wasm/Writer.cpp

Show First 20 Lines • Show All 273 Lines • ▼ Show 20 Linesvoid Writer::createExportSection() {
if (!NumExports) if (!NumExports)
return; return;
SyntheticSection *Section = createSyntheticSection(WASM_SEC_EXPORT); SyntheticSection *Section = createSyntheticSection(WASM_SEC_EXPORT);
raw_ostream &OS = Section->getStream(); raw_ostream &OS = Section->getStream();
writeUleb128(OS, NumExports, "export count"); writeUleb128(OS, NumExports, "export count");
if (ExportMemory) { if (ExportMemory)
WasmExport MemoryExport; writeExport(OS, {"memory", WASM_EXTERNAL_MEMORY, 0});
MemoryExport.Name = "memory";
MemoryExport.Kind = WASM_EXTERNAL_MEMORY;
MemoryExport.Index = 0;
writeExport(OS, MemoryExport);
}
unsigned FakeGlobalIndex = NumImportedGlobals + InputGlobals.size(); unsigned FakeGlobalIndex = NumImportedGlobals + InputGlobals.size();
for (const Symbol *Sym : ExportedSymbols) { for (const Symbol *Sym : ExportedSymbols) {
DEBUG(dbgs() << "Export: " << Sym->getName() << "\n"); StringRef Name = Sym->getName();
WasmExport Export; WasmExport Export;
Export.Name = Sym->getName(); DEBUG(dbgs() << "Export: " << Name << "\n");
if (isa<FunctionSymbol>(Sym)) {
Export.Index = Sym->getOutputIndex(); if (isa<DefinedFunction>(Sym))
Export.Kind = WASM_EXTERNAL_FUNCTION; Export = {Name, WASM_EXTERNAL_FUNCTION, Sym->getOutputIndex()};
} else if (isa<GlobalSymbol>(Sym)) { else if (isa<DefinedGlobal>(Sym))
Export.Index = Sym->getOutputIndex(); Export = {Name, WASM_EXTERNAL_GLOBAL, Sym->getOutputIndex()};
Export.Kind = WASM_EXTERNAL_GLOBAL; else if (isa<DefinedData>(Sym))
} else if (isa<DataSymbol>(Sym)) { Export = {Name, WASM_EXTERNAL_GLOBAL, FakeGlobalIndex++};
Export.Index = FakeGlobalIndex++; else
Export.Kind = WASM_EXTERNAL_GLOBAL;
} else {
llvm_unreachable("unexpected symbol type"); llvm_unreachable("unexpected symbol type");
}
writeExport(OS, Export); writeExport(OS, Export);
} }
} }
void Writer::createElemSection() { void Writer::createElemSection() {
if (IndirectFunctions.empty()) if (IndirectFunctions.empty())
return; return;
▲ Show 20 Lines • Show All 671 Lines • Show Last 20 Lines