commit e408a89a3aa83acb97f22d7d51ab341c22c6e05c
author Nicholas Wilson <nicholas@nicholaswilson.me.uk> Fri Aug 03 14:33:37 2018 +0000
committer Nicholas Wilson <nicholas@nicholaswilson.me.uk> Fri Aug 03 14:33:37 2018 +0000
tree 6b829861c534d9dc48c4940345183f528fe1c081
parent 873de9866119754dab9146026f357a27bb1d5e26

[WebAssembly] Cleanup of the way globals and global flags are handled

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

llvm-svn: 338894

llvm/lib/MC/MCExpr.cpp

diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index 0694a8f..e3a6f8e7 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -304,6 +304,7 @@
   case VK_Hexagon_IE: return "IE";
   case VK_Hexagon_IE_GOT: return "IEGOT";
   case VK_WebAssembly_FUNCTION: return "FUNCTION";
+  case VK_WebAssembly_GLOBAL: return "GLOBAL";
   case VK_WebAssembly_TYPEINDEX: return "TYPEINDEX";
   case VK_AMDGPU_GOTPCREL32_LO: return "gotpcrel32@lo";
   case VK_AMDGPU_GOTPCREL32_HI: return "gotpcrel32@hi";

llvm/lib/MC/MCWasmStreamer.cpp

diff --git a/llvm/lib/MC/MCWasmStreamer.cpp b/llvm/lib/MC/MCWasmStreamer.cpp
index 0e59322..7321a30 100644
--- a/llvm/lib/MC/MCWasmStreamer.cpp
+++ b/llvm/lib/MC/MCWasmStreamer.cpp
@@ -119,7 +119,6 @@
     break;
 
   case MCSA_ELF_TypeObject:
-    Symbol->setType(wasm::WASM_SYMBOL_TYPE_DATA);
     break;
 
   default: