[WebAssembly] Really disable wasm register name matcher

The "ShouldEmitMatchRegisterName" bit wasn't taking effect because the
WebAssembly target didn't point to the custom WebAssemblyAsmParser
record.

llvm-svn: 328155

diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
index fb303a3615d9e3b0497c760ac1cf7a2bbce195ca..9d193f09d5a7007aaa7a47ca08aff56dacd7efc0 100644 (file)
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp
@@ -32,10 +32,6 @@ using namespace llvm;
 
 #define DEBUG_TYPE "wasm-asm-parser"
 
-// TODO: TableGen generates this register name matcher, but it is not used
-// anywhere. Mark it with the "unused" attribute to suppress warnings.
-static unsigned LLVM_ATTRIBUTE_UNUSED MatchRegisterName(StringRef Name);
-
 namespace {
 
 // We store register types as SimpleValueType to retain SIMD layout

diff --git a/llvm/lib/Target/WebAssembly/WebAssembly.td b/llvm/lib/Target/WebAssembly/WebAssembly.td
index f8408d361c8385f4ef6479eaa21fd6891cdbb28c..33a4cd33f8d37b7b1f7654adc4b89cbdb8630154 100644 (file)
--- a/llvm/lib/Target/WebAssembly/WebAssembly.td
+++ b/llvm/lib/Target/WebAssembly/WebAssembly.td
@@ -77,11 +77,12 @@ def : ProcessorModel<"bleeding-edge", NoSchedModel,
 // Target Declaration
 //===----------------------------------------------------------------------===//
 
-def WebAssembly : Target {
-  let InstructionSet = WebAssemblyInstrInfo;
-}
-
 def WebAssemblyAsmParser : AsmParser {
   // The physical register names are not in the binary format or asm text
   let ShouldEmitMatchRegisterName = 0;
 }
+
+def WebAssembly : Target {
+  let InstructionSet = WebAssemblyInstrInfo;
+  let AssemblyParsers  = [WebAssemblyAsmParser];
+}