JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-09-19 19:19:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

drgn: rebase on main

Browse Source
This commit is contained in:
Jake Hillion 2023-05-04 05:58:13 -07:00 committed by Jake Hillion
parent 96c80cbb78
commit 9731a30f85
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/drgn vendored

@ -1 +1 @@
Subproject commit 9871f3ec178bbe7c5331da7595de6f4f252b8a10 Subproject commit f927c207f270da08e8515de81d79fb34208412e4

8
oi/SymbolService.cpp
View File

@ -456,7 +456,7 @@ struct drgn_program* SymbolService::getDrgnProgram() {
* task is to extract the location information for this parameter if any exist. * task is to extract the location information for this parameter if any exist.
*/ */
static void parseFormalParam(Dwarf_Die& param, static void parseFormalParam(Dwarf_Die& param,
struct drgn_module* module, struct drgn_elf_file* file,
struct drgn_program* prog, struct drgn_program* prog,
Dwarf_Die& funcDie, Dwarf_Die& funcDie,
std::shared_ptr<FuncDesc>& fd) { std::shared_ptr<FuncDesc>& fd) {
@ -469,7 +469,7 @@ static void parseFormalParam(Dwarf_Die& param,
*/ */
auto farg = fd->addArgument(); auto farg = fd->addArgument();
auto* err = auto* err =
drgn_object_locator_init(prog, module, &funcDie, &param, &farg->locator); drgn_object_locator_init(prog, file, &funcDie, &param, &farg->locator);
if (err) { if (err) {
LOG(ERROR) << "Could not initialize drgn_object_locator for parameter: " LOG(ERROR) << "Could not initialize drgn_object_locator for parameter: "
<< err->code << ", " << err->message; << err->code << ", " << err->message;
@ -597,7 +597,7 @@ static std::optional<std::shared_ptr<FuncDesc>> createFuncDesc(
auto fd = std::make_shared<FuncDesc>(request.func); auto fd = std::make_shared<FuncDesc>(request.func);
drgn_module* module = ft->type->_private.module; drgn_elf_file* file = ft->type->_private.file;
Dwarf_Die funcDie; Dwarf_Die funcDie;
if (auto* err = drgn_type_dwarf_die(ft->type, &funcDie); err != nullptr) { if (auto* err = drgn_type_dwarf_die(ft->type, &funcDie); err != nullptr) {
LOG(ERROR) << "Error obtaining DWARF DIE from type: " << err->message; LOG(ERROR) << "Error obtaining DWARF DIE from type: " << err->message;
@ -665,7 +665,7 @@ static std::optional<std::shared_ptr<FuncDesc>> createFuncDesc(
"parameters tag!"; "parameters tag!";
} }
parseFormalParam(child, module, prog, funcDie, fd); parseFormalParam(child, file, prog, funcDie, fd);
break; break;
case DW_TAG_unspecified_parameters: case DW_TAG_unspecified_parameters: