Reinstate r133513 (reverted in r133700) with an additional fix for a
-Wshorten-64-to-32 warning in Instructions.h.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133708 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 54e6b5d..acf7755 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -1119,7 +1119,7 @@
} else {
// Otherwise, write out in binary.
OS << "0b";
- for (int j = 7; j >= 0; j--) {
+ for (unsigned j = 8; j--;) {
unsigned Bit = (Code[i] >> j) & 1;
unsigned FixupBit;
@@ -1128,9 +1128,9 @@
else
FixupBit = i * 8 + (7-j);
- if (uint8_t FixupMapEntry = FixupMap[FixupBit]) {
- //assert(Bit == 0 && "Encoder wrote into fixed up bit!");
- OS << char('A' + FixupMapEntry - 1);
+ if (uint8_t MapEntry = FixupMap[FixupBit]) {
+ assert(Bit == 0 && "Encoder wrote into fixed up bit!");
+ OS << char('A' + MapEntry - 1);
} else
OS << Bit;
}