[llvm] r190604 - Somehow this important part of the patch, where I actually check the Mask,

[Joey Gouly]

Author: joey
Date: Thu Sep 12 09:23:19 2013
New Revision: 190604

URL: http://llvm.org/viewvc/llvm-project?rev=190604&view=rev
Log:
Somehow this important part of the patch, where I actually check the Mask,
got lost during my iterations of review.

Thanks to Hal for spotting it!

Modified:
    llvm/trunk/include/llvm/MC/MCInstrDesc.h
    llvm/trunk/test/MC/ARM/deprecated-v8.s

Modified: llvm/trunk/include/llvm/MC/MCInstrDesc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCInstrDesc.h?rev=190604&r1=190603&r2=190604&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCInstrDesc.h (original)
+++ llvm/trunk/include/llvm/MC/MCInstrDesc.h Thu Sep 12 09:23:19 2013
@@ -169,7 +169,7 @@ public:
                          std::string &Info) const {
     if (ComplexDeprecationInfo)
       return ComplexDeprecationInfo(MI, STI, Info);
-    if (DeprecatedFeatureMask != 0) {
+    if ((DeprecatedFeatureMask & STI.getFeatureBits()) != 0) {
       // FIXME: it would be nice to include the subtarget feature here.
       Info = "deprecated";
       return true;

Modified: llvm/trunk/test/MC/ARM/deprecated-v8.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/deprecated-v8.s?rev=190604&r1=190603&r2=190604&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/deprecated-v8.s (original)
+++ llvm/trunk/test/MC/ARM/deprecated-v8.s Thu Sep 12 09:23:19 2013
@@ -1,5 +1,8 @@
-@ RUN: llvm-mc -triple armv8 -show-encoding < %s 2>&1 | FileCheck %s
+@ RUN: llvm-mc -triple armv8 -show-encoding < %s 2>&1 | FileCheck %s --check-prefix=CHECK-V8
+@ RUN: llvm-mc -triple armv7 -show-encoding < %s 2>&1 | FileCheck %s --check-prefix=CHECK-V7
 setend be
-@ CHECK: warning: deprecated
+@ CHECK-V8: warning: deprecated
+@ CHECK-V7-NOT: warning: deprecated
 mcr p8, #0, r5, c7, c5, #4
-@ CHECK: warning: deprecated on armv8
+@ CHECK-V8: warning: deprecated on armv8
+@ CHECK-V7-NOT: warning: deprecated on armv8