Skip to content

[lldb][NFC] Use the DWARFExpression::Stack typedef #167018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[lldb][NFC] Use the DWARFExpression::Stack typedef #167018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853179f
[NFC] Use the DWARFExpression::Stack typedef
dmpots Nov 5, 2025
13a0eae
Merge branch 'main' into stack-typedef
dmpots Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "DWARFUnit.h"

#include "lldb/Core/Module.h"
#include "lldb/Expression/DWARFExpression.h"
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/StreamString.h"
Expand Down Expand Up @@ -738,7 +739,7 @@ bool DWARFUnit::ParseVendorDWARFOpcode(uint8_t op, const DataExtractor &opcodes,
lldb::offset_t &offset,
RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const {
DWARFExpression::Stack &stack) const {
return GetSymbolFileDWARF().ParseVendorDWARFOpcode(op, opcodes, offset,
reg_ctx, reg_kind, stack);
}
Expand Down
10 changes: 5 additions & 5 deletions lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ class DWARFUnit : public DWARFExpression::Delegate, public UserID {
const lldb::offset_t data_offset,
const uint8_t op) const override;

virtual bool ParseVendorDWARFOpcode(uint8_t op, const DataExtractor &opcodes,
lldb::offset_t &offset,
RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const override;
virtual bool
ParseVendorDWARFOpcode(uint8_t op, const DataExtractor &opcodes,
lldb::offset_t &offset, RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
DWARFExpression::Stack &stack) const override;

bool ParseDWARFLocationList(const DataExtractor &data,
DWARFExpressionList &loc_list) const;
Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "lldb/Core/UniqueCStringMap.h"
#include "lldb/Core/dwarf.h"
#include "lldb/Expression/DWARFExpression.h"
#include "lldb/Expression/DWARFExpressionList.h"
#include "lldb/Symbol/DebugMacros.h"
#include "lldb/Symbol/SymbolContext.h"
Expand Down Expand Up @@ -334,7 +335,7 @@ class SymbolFileDWARF : public SymbolFileCommon {
lldb::offset_t &offset,
RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const {
DWARFExpression::Stack &stack) const {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ uint64_t SymbolFileDWARFDwo::GetDebugInfoSize(bool load_all_debug_info) {
bool SymbolFileDWARFDwo::ParseVendorDWARFOpcode(
uint8_t op, const DataExtractor &opcodes, lldb::offset_t &offset,
RegisterContext *reg_ctx, lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const {
DWARFExpression::Stack &stack) const {
return GetBaseSymbolFile().ParseVendorDWARFOpcode(op, opcodes, offset,
reg_ctx, reg_kind, stack);
}
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class SymbolFileDWARFDwo : public SymbolFileDWARF {
bool ParseVendorDWARFOpcode(uint8_t op, const DataExtractor &opcodes,
lldb::offset_t &offset, RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const override;
DWARFExpression::Stack &stack) const override;

void FindGlobalVariables(ConstString name,
const CompilerDeclContext &parent_decl_ctx,
Expand Down
10 changes: 4 additions & 6 deletions lldb/source/Plugins/SymbolFile/DWARF/SymbolFileWasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@ SymbolFileWasm::GetVendorDWARFOpcodeSize(const DataExtractor &data,
return offset - data_offset;
}

bool SymbolFileWasm::ParseVendorDWARFOpcode(uint8_t op,
const DataExtractor &opcodes,
lldb::offset_t &offset,
RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const {
bool SymbolFileWasm::ParseVendorDWARFOpcode(
uint8_t op, const DataExtractor &opcodes, lldb::offset_t &offset,
RegisterContext *reg_ctx, lldb::RegisterKind reg_kind,
DWARFExpression::Stack &stack) const {
if (op != llvm::dwarf::DW_OP_WASM_location)
return false;

Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Plugins/SymbolFile/DWARF/SymbolFileWasm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#define LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_SYMBOLFILEWASM_H

#include "SymbolFileDWARF.h"
#include "lldb/Expression/DWARFExpression.h"

namespace lldb_private::plugin {
namespace dwarf {
Expand All @@ -26,7 +27,7 @@ class SymbolFileWasm : public SymbolFileDWARF {
bool ParseVendorDWARFOpcode(uint8_t op, const DataExtractor &opcodes,
lldb::offset_t &offset, RegisterContext *reg_ctx,
lldb::RegisterKind reg_kind,
std::vector<Value> &stack) const override;
DWARFExpression::Stack &stack) const override;
};
} // namespace dwarf
} // namespace lldb_private::plugin
Expand Down
10 changes: 5 additions & 5 deletions lldb/unittests/Expression/DWARFExpressionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,12 +743,12 @@ class CustomSymbolFileDWARF : public SymbolFileDWARF {
return offset - data_offset;
}

virtual bool ParseVendorDWARFOpcode(
uint8_t op, const lldb_private::DataExtractor &opcodes,
lldb::offset_t &offset,
virtual bool
ParseVendorDWARFOpcode(uint8_t op, const lldb_private::DataExtractor &opcodes,
lldb::offset_t &offset,

RegisterContext *reg_ctx, lldb::RegisterKind reg_kind,
std::vector<lldb_private::Value> &stack) const override {
RegisterContext *reg_ctx, lldb::RegisterKind reg_kind,
DWARFExpression::Stack &stack) const override {
if (op != DW_OP_WASM_location) {
return false;
}
Expand Down
Loading