diff options
Diffstat (limited to 'llvm/lib/MC/MCDisassembler/MCDisassembler.cpp')
| -rw-r--r-- | llvm/lib/MC/MCDisassembler/MCDisassembler.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp index a58e8f6d9bcc..0c041186936d 100644 --- a/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/MCDisassembler.cpp @@ -8,9 +8,6 @@ #include "llvm/MC/MCDisassembler/MCDisassembler.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/StringRef.h" -#include "llvm/Support/raw_ostream.h" -#include <algorithm> using namespace llvm; @@ -25,11 +22,12 @@ MCDisassembler::onSymbolStart(SymbolInfoTy &Symbol, uint64_t &Size, bool MCDisassembler::tryAddingSymbolicOperand(MCInst &Inst, int64_t Value, uint64_t Address, bool IsBranch, - uint64_t Offset, + uint64_t Offset, uint64_t OpSize, uint64_t InstSize) const { if (Symbolizer) - return Symbolizer->tryAddingSymbolicOperand( - Inst, *CommentStream, Value, Address, IsBranch, Offset, InstSize); + return Symbolizer->tryAddingSymbolicOperand(Inst, *CommentStream, Value, + Address, IsBranch, Offset, + OpSize, InstSize); return false; } @@ -85,10 +83,11 @@ bool XCOFFSymbolInfo::operator<(const XCOFFSymbolInfo &SymInfo) const { return SymInfo.IsLabel; // Symbols with a StorageMappingClass have higher priority than those without. - if (StorageMappingClass.hasValue() != SymInfo.StorageMappingClass.hasValue()) - return SymInfo.StorageMappingClass.hasValue(); + if (StorageMappingClass.has_value() != + SymInfo.StorageMappingClass.has_value()) + return SymInfo.StorageMappingClass.has_value(); - if (StorageMappingClass.hasValue()) { + if (StorageMappingClass) { return getSMCPriority(StorageMappingClass.getValue()) < getSMCPriority(SymInfo.StorageMappingClass.getValue()); } |