diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-05-10 00:14:04 +0000 |
|---|---|---|
| committer | Sam Clegg <sbc@chromium.org> | 2017-05-10 00:14:04 +0000 |
| commit | 41db519ba60f415e096389c6e73b1b459e7275b5 (patch) | |
| tree | c528473eaaa9bbe31726ddb905e5bb1e5a791b1d /llvm/lib | |
| parent | 4133d4a56e63c1f55cd5e87a034dfba19de0f6b4 (diff) | |
| download | bcm5719-llvm-41db519ba60f415e096389c6e73b1b459e7275b5.tar.gz bcm5719-llvm-41db519ba60f415e096389c6e73b1b459e7275b5.zip | |
[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
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/ObjectYAML/WasmYAML.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/ObjectYAML/WasmYAML.cpp b/llvm/lib/ObjectYAML/WasmYAML.cpp index 514ae55b3b6..910d32f16af 100644 --- a/llvm/lib/ObjectYAML/WasmYAML.cpp +++ b/llvm/lib/ObjectYAML/WasmYAML.cpp @@ -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 { |
