Revert "[NFC][DebugInfo][DWARF] Create new low-level dwarf library (#… (#145959)
…145081)"
This reverts commit cbf781f0bd.
Breaks a couple of buildbots.
This commit is contained in:
committed by
GitHub
parent
0f1fd8735c
commit
5d03e7a204
@@ -36,8 +36,7 @@
|
||||
#include "lldb/Target/StackID.h"
|
||||
#include "lldb/Target/Target.h"
|
||||
#include "lldb/Target/Thread.h"
|
||||
#include "llvm/DebugInfo/DWARF/DWARFExpressionPrinter.h"
|
||||
#include "llvm/DebugInfo/DWARF/LowLevel/DWARFExpression.h"
|
||||
#include "llvm/DebugInfo/DWARF/DWARFExpression.h"
|
||||
|
||||
using namespace lldb;
|
||||
using namespace lldb_private;
|
||||
@@ -82,7 +81,7 @@ void DWARFExpression::DumpLocation(Stream *s, lldb::DescriptionLevel level,
|
||||
llvm::DIDumpOptions DumpOpts;
|
||||
DumpOpts.GetNameForDWARFReg = GetRegName;
|
||||
llvm::DWARFExpression E(m_data.GetAsLLVM(), m_data.GetAddressByteSize());
|
||||
llvm::printDwarfExpression(&E, s->AsRawOstream(), DumpOpts, nullptr);
|
||||
llvm::DWARFExpressionPrinter::print(&E, s->AsRawOstream(), DumpOpts, nullptr);
|
||||
}
|
||||
|
||||
RegisterKind DWARFExpression::GetRegisterKind() const { return m_reg_kind; }
|
||||
|
||||
@@ -17,8 +17,7 @@
|
||||
#include "lldb/Utility/Log.h"
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "llvm/DebugInfo/DIContext.h"
|
||||
#include "llvm/DebugInfo/DWARF/DWARFExpressionPrinter.h"
|
||||
#include "llvm/DebugInfo/DWARF/LowLevel/DWARFExpression.h"
|
||||
#include "llvm/DebugInfo/DWARF/DWARFExpression.h"
|
||||
#include <optional>
|
||||
|
||||
using namespace lldb;
|
||||
@@ -90,7 +89,8 @@ static void DumpDWARFExpr(Stream &s, llvm::ArrayRef<uint8_t> expr, Thread *threa
|
||||
order_and_width->second);
|
||||
llvm::DWARFExpression E(data, order_and_width->second,
|
||||
llvm::dwarf::DWARF32);
|
||||
printDwarfExpression(&E, s.AsRawOstream(), llvm::DIDumpOptions(), nullptr);
|
||||
llvm::DWARFExpressionPrinter::print(&E, s.AsRawOstream(),
|
||||
llvm::DIDumpOptions(), nullptr);
|
||||
} else
|
||||
s.PutCString("dwarf-expr");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user