From bde17ff28a21fb30aa753bbe5b0c8b5ec7716cf9 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 10 May 2017 00:14:04 +0000 Subject: [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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@302606 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ObjectYAML/WasmYAML.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/ObjectYAML') diff --git a/lib/ObjectYAML/WasmYAML.cpp b/lib/ObjectYAML/WasmYAML.cpp index 514ae55b3b6..910d32f16af 100644 --- a/lib/ObjectYAML/WasmYAML.cpp +++ b/lib/ObjectYAML/WasmYAML.cpp @@ -265,10 +265,10 @@ void MappingTraits::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 { -- cgit v1.2.3