This is an archive of the discontinued LLVM Phabricator instance.

Differential D33022

[WebAssembly] Fix build error in wasm YAML code
ClosedPublic

Authored by sbc100 on May 9 2017, 5:26 PM.

Details

Reviewers
dschuff
Commits
rG41db519ba60f: [WebAssembly] Fix build error in wasm YAML code
rL302606: [WebAssembly] Fix build error in wasm YAML code
Summary

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.

Diff Detail

Event Timeline

sbc100 created this revision.May 9 2017, 5:26 PM
Herald added subscribers: jgravelle-google, fhahn, dschuff, jfb. · View Herald TranscriptMay 9 2017, 5:26 PM
sbc100 added a reviewer: dschuff.May 9 2017, 5:26 PM
Closed by commit rL302606: [WebAssembly] Fix build error in wasm YAML code (authored by sbc). · Explain WhyMay 9 2017, 5:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
llvm/
ObjectYAML/
4 lines
lib/
ObjectYAML/
6 lines
tools/
obj2yaml/
6 lines
yaml2obj/
8 lines

Diff 98374

include/llvm/ObjectYAML/WasmYAML.h

Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Lines
}; };
struct Import { struct Import {
StringRef Module; StringRef Module;
StringRef Field; StringRef Field;
ExportKind Kind; ExportKind Kind;
union { union {
uint32_t SigIndex; uint32_t SigIndex;
Global Global; Global GlobalImport;
Table Table; Table TableImport;
Limits Memory; Limits Memory;
}; };
}; };
struct LocalDecl { struct LocalDecl {
ValueType Type; ValueType Type;
uint32_t Count; uint32_t Count;
}; };
▲ Show 20 Lines • Show All 274 Lines • Show Last 20 Lines

lib/ObjectYAML/WasmYAML.cpp

Show First 20 Lines • Show All 259 Lines • ▼ Show 20 Lines
void MappingTraits<WasmYAML::Import>::mapping(IO &IO, void MappingTraits<WasmYAML::Import>::mapping(IO &IO,
WasmYAML::Import &Import) { WasmYAML::Import &Import) {
IO.mapRequired("Module", Import.Module); IO.mapRequired("Module", Import.Module);
IO.mapRequired("Field", Import.Field); IO.mapRequired("Field", Import.Field);
IO.mapRequired("Kind", Import.Kind); IO.mapRequired("Kind", Import.Kind);
if (Import.Kind == wasm::WASM_EXTERNAL_FUNCTION) { if (Import.Kind == wasm::WASM_EXTERNAL_FUNCTION) {
IO.mapRequired("SigIndex", Import.SigIndex); IO.mapRequired("SigIndex", Import.SigIndex);
} else if (Import.Kind == wasm::WASM_EXTERNAL_GLOBAL) { } else if (Import.Kind == wasm::WASM_EXTERNAL_GLOBAL) {
IO.mapRequired("GlobalType", Import.Global.Type); IO.mapRequired("GlobalType", Import.GlobalImport.Type);
IO.mapRequired("GlobalMutable", Import.Global.Mutable); IO.mapRequired("GlobalMutable", Import.GlobalImport.Mutable);
} else if (Import.Kind == wasm::WASM_EXTERNAL_TABLE) { } 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 ) { } else if (Import.Kind == wasm::WASM_EXTERNAL_MEMORY ) {
IO.mapRequired("Memory", Import.Memory); IO.mapRequired("Memory", Import.Memory);
} else { } else {
llvm_unreachable("unhandled import type"); llvm_unreachable("unhandled import type");
} }
} }
void MappingTraits<WasmYAML::Export>::mapping(IO &IO, void MappingTraits<WasmYAML::Export>::mapping(IO &IO,
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines

tools/obj2yaml/wasm2yaml.cpp

Show First 20 Lines • Show All 102 Lines • ▼ Show 20 Lines case wasm::WASM_SEC_IMPORT: {
Im.Module = Import.Module; Im.Module = Import.Module;
Im.Field = Import.Field; Im.Field = Import.Field;
Im.Kind = Import.Kind; Im.Kind = Import.Kind;
switch (Im.Kind) { switch (Im.Kind) {
case wasm::WASM_EXTERNAL_FUNCTION: case wasm::WASM_EXTERNAL_FUNCTION:
Im.SigIndex = Import.SigIndex; Im.SigIndex = Import.SigIndex;
break; break;
case wasm::WASM_EXTERNAL_GLOBAL: case wasm::WASM_EXTERNAL_GLOBAL:
Im.Global.Type = Import.Global.Type; Im.GlobalImport.Type = Import.Global.Type;
Im.Global.Mutable = Import.Global.Mutable; Im.GlobalImport.Mutable = Import.Global.Mutable;
break; break;
case wasm::WASM_EXTERNAL_TABLE: case wasm::WASM_EXTERNAL_TABLE:
Im.Table = make_table(Import.Table); Im.TableImport = make_table(Import.Table);
break; break;
case wasm::WASM_EXTERNAL_MEMORY: case wasm::WASM_EXTERNAL_MEMORY:
Im.Memory = make_limits(Import.Memory); Im.Memory = make_limits(Import.Memory);
break; break;
} }
ImportSec->Imports.push_back(Im); ImportSec->Imports.push_back(Im);
} }
S = std::move(ImportSec); S = std::move(ImportSec);
▲ Show 20 Lines • Show All 130 Lines • Show Last 20 Lines

tools/yaml2obj/yaml2wasm.cpp

Show First 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const WasmYAML::Import &Import : Section.Imports) {
writeStringRef(Import.Module, OS); writeStringRef(Import.Module, OS);
writeStringRef(Import.Field, OS); writeStringRef(Import.Field, OS);
encodeULEB128(Import.Kind, OS); encodeULEB128(Import.Kind, OS);
switch (Import.Kind) { switch (Import.Kind) {
case wasm::WASM_EXTERNAL_FUNCTION: case wasm::WASM_EXTERNAL_FUNCTION:
encodeULEB128(Import.SigIndex, OS); encodeULEB128(Import.SigIndex, OS);
break; break;
case wasm::WASM_EXTERNAL_GLOBAL: case wasm::WASM_EXTERNAL_GLOBAL:
encodeSLEB128(Import.Global.Type, OS); encodeSLEB128(Import.GlobalImport.Type, OS);
writeUint8(OS, Import.Global.Mutable); writeUint8(OS, Import.GlobalImport.Mutable);
break; break;
case wasm::WASM_EXTERNAL_MEMORY: case wasm::WASM_EXTERNAL_MEMORY:
writeLimits(Import.Memory, OS); writeLimits(Import.Memory, OS);
break; break;
case wasm::WASM_EXTERNAL_TABLE: case wasm::WASM_EXTERNAL_TABLE:
encodeSLEB128(Import.Table.ElemType, OS); encodeSLEB128(Import.TableImport.ElemType, OS);
writeLimits(Import.Table.TableLimits, OS); writeLimits(Import.TableImport.TableLimits, OS);
break; break;
default: default:
errs() << "Unknown import type: " << Import.Kind; errs() << "Unknown import type: " << Import.Kind;
return 1; return 1;
} }
} }
return 0; return 0;
} }
▲ Show 20 Lines • Show All 222 Lines • Show Last 20 Lines