Author: David Blaikie Date: 2020-10-23T19:20:38-07:00 New Revision: 0b057320453b90bb409f55f74386b6841546d48a
URL: https://github.com/llvm/llvm-project/commit/0b057320453b90bb409f55f74386b6841546d48a DIFF: https://github.com/llvm/llvm-project/commit/0b057320453b90bb409f55f74386b6841546d48a.diff LOG: fix lldb for recent libDebugInfoDWARF API change Added: Modified: lldb/source/Expression/DWARFExpression.cpp lldb/source/Symbol/UnwindPlan.cpp lldb/unittests/Symbol/PostfixExpressionTest.cpp lldb/unittests/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpressionTests.cpp Removed: ################################################################################ diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp index b42c9cfafb4f..755480ac5532 100644 --- a/lldb/source/Expression/DWARFExpression.cpp +++ b/lldb/source/Expression/DWARFExpression.cpp @@ -89,8 +89,8 @@ void DWARFExpression::DumpLocation(Stream *s, const DataExtractor &data, lldb::DescriptionLevel level, ABI *abi) const { llvm::DWARFExpression(data.GetAsLLVM(), data.GetAddressByteSize()) - .print(s->AsRawOstream(), abi ? &abi->GetMCRegisterInfo() : nullptr, - nullptr); + .print(s->AsRawOstream(), llvm::DIDumpOptions(), + abi ? &abi->GetMCRegisterInfo() : nullptr, nullptr); } void DWARFExpression::SetLocationListAddresses(addr_t cu_file_addr, diff --git a/lldb/source/Symbol/UnwindPlan.cpp b/lldb/source/Symbol/UnwindPlan.cpp index 278a79d8c0ec..d24cabed14ce 100644 --- a/lldb/source/Symbol/UnwindPlan.cpp +++ b/lldb/source/Symbol/UnwindPlan.cpp @@ -83,7 +83,7 @@ static void DumpDWARFExpr(Stream &s, llvm::ArrayRef<uint8_t> expr, Thread *threa llvm::DataExtractor data(expr, order_and_width->first == eByteOrderLittle, order_and_width->second); llvm::DWARFExpression(data, order_and_width->second, llvm::dwarf::DWARF32) - .print(s.AsRawOstream(), nullptr, nullptr); + .print(s.AsRawOstream(), llvm::DIDumpOptions(), nullptr, nullptr); } else s.PutCString("dwarf-expr"); } diff --git a/lldb/unittests/Symbol/PostfixExpressionTest.cpp b/lldb/unittests/Symbol/PostfixExpressionTest.cpp index aee153d5ccef..9f66aeed6b68 100644 --- a/lldb/unittests/Symbol/PostfixExpressionTest.cpp +++ b/lldb/unittests/Symbol/PostfixExpressionTest.cpp @@ -158,7 +158,7 @@ static std::string ParseAndGenerateDWARF(llvm::StringRef expr) { std::string result; llvm::raw_string_ostream os(result); llvm::DWARFExpression(extractor, addr_size, llvm::dwarf::DWARF32) - .print(os, nullptr, nullptr); + .print(os, llvm::DIDumpOptions(), nullptr, nullptr); return std::move(os.str()); } diff --git a/lldb/unittests/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpressionTests.cpp b/lldb/unittests/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpressionTests.cpp index 334a08f92033..3692f0c94c51 100644 --- a/lldb/unittests/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpressionTests.cpp +++ b/lldb/unittests/SymbolFile/NativePDB/PdbFPOProgramToDWARFExpressionTests.cpp @@ -39,7 +39,7 @@ CheckValidProgramTranslation(llvm::StringRef fpo_program, std::string result; llvm::raw_string_ostream os(result); llvm::DWARFExpression(extractor, /*AddressSize=*/4, llvm::dwarf::DWARF32) - .print(os, nullptr, nullptr); + .print(os, llvm::DIDumpOptions(), nullptr, nullptr); // actual check ASSERT_EQ(expected_dwarf_expression, os.str()); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits