commit 41db519ba60f415e096389c6e73b1b459e7275b5
author Sam Clegg <sbc@chromium.org> Wed May 10 00:14:04 2017 +0000
committer Sam Clegg <sbc@chromium.org> Wed May 10 00:14:04 2017 +0000
tree c528473eaaa9bbe31726ddb905e5bb1e5a791b1d
parent 4133d4a56e63c1f55cd5e87a034dfba19de0f6b4

[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

llvm/include/llvm/ObjectYAML/WasmYAML.h

diff --git a/llvm/include/llvm/ObjectYAML/WasmYAML.h b/llvm/include/llvm/ObjectYAML/WasmYAML.h
index 747cd62..7b70c95 100644
--- a/llvm/include/llvm/ObjectYAML/WasmYAML.h
+++ b/llvm/include/llvm/ObjectYAML/WasmYAML.h
@@ -69,8 +69,8 @@
   ExportKind Kind;
   union {
     uint32_t SigIndex;
-    Global Global;
-    Table Table;
+    Global GlobalImport;
+    Table TableImport;
     Limits Memory;
   };
 };

llvm/lib/ObjectYAML/WasmYAML.cpp

diff --git a/llvm/lib/ObjectYAML/WasmYAML.cpp b/llvm/lib/ObjectYAML/WasmYAML.cpp
index 514ae55..910d32f 100644
--- a/llvm/lib/ObjectYAML/WasmYAML.cpp
+++ b/llvm/lib/ObjectYAML/WasmYAML.cpp
@@ -265,10 +265,10 @@
   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 {

llvm/tools/obj2yaml/wasm2yaml.cpp

diff --git a/llvm/tools/obj2yaml/wasm2yaml.cpp b/llvm/tools/obj2yaml/wasm2yaml.cpp
index 6efa2ac..d4d978f 100644
--- a/llvm/tools/obj2yaml/wasm2yaml.cpp
+++ b/llvm/tools/obj2yaml/wasm2yaml.cpp
@@ -108,11 +108,11 @@
           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);

llvm/tools/yaml2obj/yaml2wasm.cpp

diff --git a/llvm/tools/yaml2obj/yaml2wasm.cpp b/llvm/tools/yaml2obj/yaml2wasm.cpp
index 502b1e6..5c8aba3 100644
--- a/llvm/tools/yaml2obj/yaml2wasm.cpp
+++ b/llvm/tools/yaml2obj/yaml2wasm.cpp
@@ -169,15 +169,15 @@
       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;