From 440219d53ef6e6c412fe2e6b041f515f1e0cb4bf Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 21 Mar 2018 21:46:47 +0000 Subject: [PATCH] [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 --- llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp | 4 ---- llvm/lib/Target/WebAssembly/WebAssembly.td | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp index fb303a3..9d193f0 100644 --- 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 f8408d3..33a4cd3 100644 --- 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]; +} -- 2.7.4