From f6b9716fa19129279e08b3d2efb5d94418908994 Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff@google.com>
Date: Tue, 2 Aug 2016 23:31:56 +0000
Subject: [PATCH] [WebAssembly] Remove unnecessary subtarget checks in peephole
 pass

Leftover from D22686; the passes can handle all the instructions
unconditionally; only isel needs to care whether to generate them.

llvm-svn: 277549
---
 .../WebAssembly/WebAssemblyPeephole.cpp       | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/lib/Target/WebAssembly/WebAssemblyPeephole.cpp b/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
index 1c3c1043e85..a6670b49783 100644
--- a/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
+++ b/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
@@ -108,8 +108,7 @@ bool WebAssemblyPeephole::runOnMachineFunction(MachineFunction &MF) {
 
   MachineRegisterInfo &MRI = MF.getRegInfo();
   WebAssemblyFunctionInfo &MFI = *MF.getInfo<WebAssemblyFunctionInfo>();
-  const auto &Subtarget = MF.getSubtarget<WebAssemblySubtarget>();
-  const auto &TII = *Subtarget.getInstrInfo();
+  const auto &TII = *MF.getSubtarget<WebAssemblySubtarget>().getInstrInfo();
   const WebAssemblyTargetLowering &TLI =
       *MF.getSubtarget<WebAssemblySubtarget>().getTargetLowering();
   auto &LibInfo = getAnalysis<TargetLibraryInfoWrapperPass>().getTLI();
@@ -188,32 +187,24 @@ bool WebAssemblyPeephole::runOnMachineFunction(MachineFunction &MF) {
             WebAssembly::COPY_LOCAL_F64);
         break;
       case WebAssembly::RETURN_v16i8:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v16i8,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v16i8,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_v8i16:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v8i16,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v8i16,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_v4i32:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v4i32,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v4i32,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_v4f32:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v4f32,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v4f32,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_VOID:
         if (!DisableWebAssemblyFallthroughReturnOpt &&