Reverting r237234, "Use std::bitset for SubtargetFeatures"

[oota-llvm.git] / include / llvm / MC / MCInstrDesc.h

diff --git a/include/llvm/MC/MCInstrDesc.h b/include/llvm/MC/MCInstrDesc.h
index e23a8b61de5dad24166678f6890096f4344a862e..c74d1c3fd86df6c4f67d66b0cb9e0c9b84e2d15c 100644 (file)
--- a/include/llvm/MC/MCInstrDesc.h
+++ b/include/llvm/MC/MCInstrDesc.h
@@ -144,9 +144,8 @@ public:
   const uint16_t *ImplicitUses; // Registers implicitly read by this instr
   const uint16_t *ImplicitDefs; // Registers implicitly defined by this instr
   const MCOperandInfo *OpInfo;  // 'NumOperands' entries about operands
-  FeatureBitset
+  uint64_t
       DeprecatedFeatureMask; // Feature bits that this is deprecated on, if any
-
   // A complex method to determine is a certain is deprecated or not, and return
   // the reason for deprecation.
   bool (*ComplexDeprecationInfo)(MCInst &, MCSubtargetInfo &, std::string &);
@@ -169,7 +168,7 @@ public:
                          std::string &Info) const {
     if (ComplexDeprecationInfo)
       return ComplexDeprecationInfo(MI, STI, Info);
-    if ((STI.getFeatureBits() & DeprecatedFeatureMask).any()) {
+    if ((DeprecatedFeatureMask & STI.getFeatureBits()) != 0) {
       // FIXME: it would be nice to include the subtarget feature here.
       Info = "deprecated";
       return true;