replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WebAssembly] Fix build error in wasm YAML code 

This warning didn't show up on my local build
but is causing the bots to fail.  Seems like a
bad idea to have types and variables with the
same name anyhow.

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

llvm-svn: 302606
This commit is contained in:
Sam Clegg 2017-05-10 00:14:04 +00:00
parent 4133d4a56e
commit 41db519ba6
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/ObjectYAML/WasmYAML.h
View File

@ -69,8 +69,8 @@ struct Import {
ExportKind Kind;
union {
uint32_t SigIndex;
Global Global;
Table Table;
Global GlobalImport;
Table TableImport;
Limits Memory;
};
};

6
llvm/lib/ObjectYAML/WasmYAML.cpp
View File

@ -265,10 +265,10 @@ void MappingTraits<WasmYAML::Import>::mapping(IO &IO,
if (Import.Kind == wasm::WASM_EXTERNAL_FUNCTION) {
IO.mapRequired("SigIndex", Import.SigIndex);
} else if (Import.Kind == wasm::WASM_EXTERNAL_GLOBAL) {
IO.mapRequired("GlobalType", Import.Global.Type);
IO.mapRequired("GlobalMutable", Import.Global.Mutable);
IO.mapRequired("GlobalType", Import.GlobalImport.Type);
IO.mapRequired("GlobalMutable", Import.GlobalImport.Mutable);
} else if (Import.Kind == wasm::WASM_EXTERNAL_TABLE) {
IO.mapRequired("Table", Import.Table);
IO.mapRequired("Table", Import.TableImport);
} else if (Import.Kind == wasm::WASM_EXTERNAL_MEMORY ) {
IO.mapRequired("Memory", Import.Memory);
} else {

6
llvm/tools/obj2yaml/wasm2yaml.cpp
View File

@ -108,11 +108,11 @@ ErrorOr<WasmYAML::Object *> WasmDumper::dump() {
Im.SigIndex = Import.SigIndex;
break;
case wasm::WASM_EXTERNAL_GLOBAL:
Im.Global.Type = Import.Global.Type;
Im.Global.Mutable = Import.Global.Mutable;
Im.GlobalImport.Type = Import.Global.Type;
Im.GlobalImport.Mutable = Import.Global.Mutable;
break;
case wasm::WASM_EXTERNAL_TABLE:
Im.Table = make_table(Import.Table);
Im.TableImport = make_table(Import.Table);
break;
case wasm::WASM_EXTERNAL_MEMORY:
Im.Memory = make_limits(Import.Memory);

8
llvm/tools/yaml2obj/yaml2wasm.cpp
View File

@ -169,15 +169,15 @@ int WasmWriter::writeSectionContent(raw_ostream &OS,
encodeULEB128(Import.SigIndex, OS);
break;
case wasm::WASM_EXTERNAL_GLOBAL:
encodeSLEB128(Import.Global.Type, OS);
writeUint8(OS, Import.Global.Mutable);
encodeSLEB128(Import.GlobalImport.Type, OS);
writeUint8(OS, Import.GlobalImport.Mutable);
break;
case wasm::WASM_EXTERNAL_MEMORY:
writeLimits(Import.Memory, OS);
break;
case wasm::WASM_EXTERNAL_TABLE:
encodeSLEB128(Import.Table.ElemType, OS);
writeLimits(Import.Table.TableLimits, OS);
encodeSLEB128(Import.TableImport.ElemType, OS);
writeLimits(Import.TableImport.TableLimits, OS);
break;
default:
errs() << "Unknown import type: " << Import.Kind;