This is an archive of the discontinued LLVM Phabricator instance.

Differential D43849

[WebAssembly] Simplify createDefined. NFC.
ClosedPublic

Authored by ruiu on Feb 27 2018, 5:47 PM.

Details

Reviewers
sbc100
Commits
rGe89b0ef0a0ad: [WebAssembly] Simplify createDefined. NFC.
rLLD326615: [WebAssembly] Simplify createDefined. NFC.
rL326615: [WebAssembly] Simplify createDefined. NFC.
Summary

[WebAssembly] Simplify createDefined. NFC.

Diff Detail

Repository
rL LLVM

Event Timeline

ruiu created this revision.Feb 27 2018, 5:47 PM
Herald added subscribers: sunfish, aheejin, jgravelle-google and 2 others. · View Herald TranscriptFeb 27 2018, 5:47 PM
Harbormaster completed remote builds in B15499: Diff 136209.Feb 27 2018, 5:48 PM
sbc100 accepted this revision.Mar 1 2018, 9:09 PM
This revision is now accepted and ready to land.Mar 1 2018, 9:09 PM
Closed by commit rL326615: [WebAssembly] Simplify createDefined. NFC. (authored by ruiu). · Explain WhyMar 2 2018, 1:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
wasm/
19 lines

Diff 136836

lld/trunk/wasm/InputFiles.cpp

Show First 20 Lines • Show All 169 Lines • ▼ Show 20 Lines
DataSymbol *ObjFile::getDataSymbol(uint32_t Index) const { DataSymbol *ObjFile::getDataSymbol(uint32_t Index) const {
return cast<DataSymbol>(Symbols[Index]); return cast<DataSymbol>(Symbols[Index]);
} }
Symbol *ObjFile::createDefined(const WasmSymbol &Sym) { Symbol *ObjFile::createDefined(const WasmSymbol &Sym) {
if (!Sym.isDefined()) if (!Sym.isDefined())
return nullptr; return nullptr;
StringRef Name = Sym.Info.Name;
uint32_t Flags = Sym.Info.Flags;
switch (Sym.Info.Kind) { switch (Sym.Info.Kind) {
case WASM_SYMBOL_TYPE_FUNCTION: { case WASM_SYMBOL_TYPE_FUNCTION: {
InputFunction *Func = InputFunction *Func =
Functions[Sym.Info.ElementIndex - WasmObj->getNumImportedFunctions()]; Functions[Sym.Info.ElementIndex - WasmObj->getNumImportedFunctions()];
if (isExcludedByComdat(Func)) { if (isExcludedByComdat(Func)) {
Func->Live = false; Func->Live = false;
return nullptr; return nullptr;
} }
if (Sym.isBindingLocal()) if (Sym.isBindingLocal())
return make<DefinedFunction>(Sym.Info.Name, Sym.Info.Flags, this, Func); return make<DefinedFunction>(Name, Flags, this, Func);
return Symtab->addDefinedFunction(Sym.Info.Name, Sym.Info.Flags, this, return Symtab->addDefinedFunction(Name, Flags, this, Func);
Func);
} }
case WASM_SYMBOL_TYPE_DATA: { case WASM_SYMBOL_TYPE_DATA: {
InputSegment *Seg = Segments[Sym.Info.DataRef.Segment]; InputSegment *Seg = Segments[Sym.Info.DataRef.Segment];
if (isExcludedByComdat(Seg)) { if (isExcludedByComdat(Seg)) {
Seg->Live = false; Seg->Live = false;
return nullptr; return nullptr;
} }
uint32_t Offset = Sym.Info.DataRef.Offset; uint32_t Offset = Sym.Info.DataRef.Offset;
uint32_t Size = Sym.Info.DataRef.Size; uint32_t Size = Sym.Info.DataRef.Size;
if (Sym.isBindingLocal()) if (Sym.isBindingLocal())
return make<DefinedData>(Sym.Info.Name, Sym.Info.Flags, this, Seg, Offset, return make<DefinedData>(Name, Flags, this, Seg, Offset, Size);
Size); return Symtab->addDefinedData(Name, Flags, this, Seg, Offset, Size);
return Symtab->addDefinedData(Sym.Info.Name, Sym.Info.Flags, this, Seg,
Offset, Size);
} }
case WASM_SYMBOL_TYPE_GLOBAL: case WASM_SYMBOL_TYPE_GLOBAL:
InputGlobal *Global = InputGlobal *Global =
Globals[Sym.Info.ElementIndex - WasmObj->getNumImportedGlobals()]; Globals[Sym.Info.ElementIndex - WasmObj->getNumImportedGlobals()];
if (Sym.isBindingLocal()) if (Sym.isBindingLocal())
return make<DefinedGlobal>(Sym.Info.Name, Sym.Info.Flags, this, Global); return make<DefinedGlobal>(Name, Flags, this, Global);
return Symtab->addDefinedGlobal(Sym.Info.Name, Sym.Info.Flags, this, return Symtab->addDefinedGlobal(Name, Flags, this, Global);
Global);
} }
llvm_unreachable("unkown symbol kind"); llvm_unreachable("unkown symbol kind");
} }
Symbol *ObjFile::createUndefined(const WasmSymbol &Sym) { Symbol *ObjFile::createUndefined(const WasmSymbol &Sym) {
StringRef Name = Sym.Info.Name; StringRef Name = Sym.Info.Name;
uint32_t Flags = Sym.Info.Flags; uint32_t Flags = Sym.Info.Flags;
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines