Reverting r237234, "Use std::bitset for SubtargetFeatures"
The buildbots are still not satisfied.
MIPS and ARM are failing (even though at least MIPS was expected to pass).
llvm-svn: 237245
diff --git a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
index 46a6b3c..e8c5475 100644
--- a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
+++ b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
@@ -80,19 +80,20 @@
MCContext &Ctx,
std::unique_ptr<const MCInstrInfo> MII)
: MCDisassembler(STI, Ctx), MII(std::move(MII)) {
- const FeatureBitset &FB = STI.getFeatureBits();
- if (FB[X86::Mode16Bit]) {
+ switch (STI.getFeatureBits() &
+ (X86::Mode16Bit | X86::Mode32Bit | X86::Mode64Bit)) {
+ case X86::Mode16Bit:
fMode = MODE_16BIT;
- return;
- } else if (FB[X86::Mode32Bit]) {
+ break;
+ case X86::Mode32Bit:
fMode = MODE_32BIT;
- return;
- } else if (FB[X86::Mode64Bit]) {
+ break;
+ case X86::Mode64Bit:
fMode = MODE_64BIT;
- return;
+ break;
+ default:
+ llvm_unreachable("Invalid CPU mode");
}
-
- llvm_unreachable("Invalid CPU mode");
}
struct Region {