diff options
Diffstat (limited to 'contrib/llvm-project/llvm/tools/llvm-objdump/SourcePrinter.cpp')
| -rw-r--r-- | contrib/llvm-project/llvm/tools/llvm-objdump/SourcePrinter.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/contrib/llvm-project/llvm/tools/llvm-objdump/SourcePrinter.cpp b/contrib/llvm-project/llvm/tools/llvm-objdump/SourcePrinter.cpp index c8ea6b543245..6736cbc9ad5f 100644 --- a/contrib/llvm-project/llvm/tools/llvm-objdump/SourcePrinter.cpp +++ b/contrib/llvm-project/llvm/tools/llvm-objdump/SourcePrinter.cpp @@ -31,7 +31,7 @@ unsigned getInstStartColumn(const MCSubtargetInfo &STI) { } bool LiveVariable::liveAtAddress(object::SectionedAddress Addr) { - if (LocExpr.Range == None) + if (LocExpr.Range == std::nullopt) return false; return LocExpr.Range->SectionIndex == Addr.SectionIndex && LocExpr.Range->LowPC <= Addr.Address && @@ -42,7 +42,17 @@ void LiveVariable::print(raw_ostream &OS, const MCRegisterInfo &MRI) const { DataExtractor Data({LocExpr.Expr.data(), LocExpr.Expr.size()}, Unit->getContext().isLittleEndian(), 0); DWARFExpression Expression(Data, Unit->getAddressByteSize()); - Expression.printCompact(OS, MRI); + + auto GetRegName = [&MRI, &OS](uint64_t DwarfRegNum, bool IsEH) -> StringRef { + if (std::optional<unsigned> LLVMRegNum = + MRI.getLLVMRegNum(DwarfRegNum, IsEH)) + if (const char *RegName = MRI.getName(*LLVMRegNum)) + return StringRef(RegName); + OS << "<unknown register " << DwarfRegNum << ">"; + return {}; + }; + + Expression.printCompact(OS, GetRegName); } void LiveVariablePrinter::addVariable(DWARFDie FuncDie, DWARFDie VarDie) { |