maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[WebAssembly] Add minor helper functions to WasmObjectFile 

Also, fix crash when exporting an imported function.

Differential Revision: https://reviews.llvm.org/D42454

llvm-svn: 323290
This commit is contained in:
Sam Clegg 2018-01-24 01:27:17 +00:00
parent 70fd374d1e
commit 23012e98c9
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/Object/Wasm.h
View File

@ -205,6 +205,9 @@ public:
private:
bool isValidFunctionIndex(uint32_t Index) const;
bool isDefinedFunctionIndex(uint32_t Index) const;
wasm::WasmFunction& getDefinedFunction(uint32_t Index);
const WasmSection &getWasmSection(DataRefImpl Ref) const;
const wasm::WasmRelocation &getWasmRelocation(DataRefImpl Ref) const;

27
llvm/lib/Object/WasmObjectFile.cpp
View File

@ -292,10 +292,10 @@ Error WasmObjectFile::parseNameSection(const uint8_t *Ptr, const uint8_t *End) {
return make_error<GenericBinaryError>("Invalid name entry",
object_error::parse_failed);
DebugNames.push_back(wasm::WasmFunctionName{Index, Name});
if (Index >= NumImportedFunctions) {
if (isDefinedFunctionIndex(Index)) {
// Override any existing name; the name specified by the "names"
// section is the Function's canonical name.
Functions[Index - NumImportedFunctions].Name = Name;
getDefinedFunction(Index).Name = Name;
}
}
break;
@ -369,8 +369,9 @@ void WasmObjectFile::populateSymbolTable() {
<< " sym index:" << SymIndex << "\n");
}
}
if (Export.Kind == wasm::WASM_EXTERNAL_FUNCTION) {
auto &Function = Functions[Export.Index - NumImportedFunctions];
if (Export.Kind == wasm::WASM_EXTERNAL_FUNCTION &&
isDefinedFunctionIndex(Export.Index)) {
auto &Function = getDefinedFunction(Export.Index);
if (Function.Name.empty()) {
// Use the export's name to set a name for the Function, but only if one
// hasn't already been set.
@ -501,14 +502,13 @@ Error WasmObjectFile::parseLinkingSectionComdat(const uint8_t *&Ptr,
DataSegments[Index].Data.Comdat = Name;
break;
case wasm::WASM_COMDAT_FUNCTION:
if (Index < NumImportedFunctions || !isValidFunctionIndex(Index))
if (!isDefinedFunctionIndex(Index))
return make_error<GenericBinaryError>("COMDAT function index out of range",
object_error::parse_failed);
Index -= NumImportedFunctions;
if (!Functions[Index].Comdat.empty())
if (!getDefinedFunction(Index).Comdat.empty())
return make_error<GenericBinaryError>("Function in two COMDATs",
object_error::parse_failed);
Functions[Index].Comdat = Name;
getDefinedFunction(Index).Comdat = Name;
break;
}
}
@ -736,7 +736,7 @@ Error WasmObjectFile::parseExportSection(const uint8_t *Ptr, const uint8_t *End)
Ex.Index = readVaruint32(Ptr);
switch (Ex.Kind) {
case wasm::WASM_EXTERNAL_FUNCTION:
if (Ex.Index >= FunctionTypes.size() + NumImportedFunctions)
if (!isValidFunctionIndex(Ex.Index))
return make_error<GenericBinaryError>("Invalid function export",
object_error::parse_failed);
break;
@ -765,6 +765,15 @@ bool WasmObjectFile::isValidFunctionIndex(uint32_t Index) const {
return Index < FunctionTypes.size() + NumImportedFunctions;
}
bool WasmObjectFile::isDefinedFunctionIndex(uint32_t Index) const {
return Index >= NumImportedFunctions && isValidFunctionIndex(Index);
}
wasm::WasmFunction& WasmObjectFile::getDefinedFunction(uint32_t Index) {
assert(isDefinedFunctionIndex(Index));
return Functions[Index - NumImportedFunctions];
}
Error WasmObjectFile::parseStartSection(const uint8_t *Ptr, const uint8_t *End) {
StartFunction = readVaruint32(Ptr);
if (!isValidFunctionIndex(StartFunction))