gdb/python: add subblocks property to gdb.Block

This commit adds new propery "subblocks" to gdb.Block objects. This
allows Python to traverse block tree starting with global block.

Reviewed-By: Eli Zaretskii <eliz@gnu.org>
Approved-By: Andrew Burgess <aburgess@redhat.com>
This commit is contained in:
Jan Vrany
2025-02-04 13:56:49 +00:00
parent 96a02b669e
commit 5166ed9c9c
4 changed files with 48 additions and 3 deletions

View File

@@ -152,6 +152,9 @@ binary-upload in qSupported reply
** Added the gdb.Symbol.is_artificial attribute.
** Added gdb.Block.subblocks. Returns a list of blocks contained in that
block.
* Debugger Adapter Protocol changes
** The "scopes" request will now return a scope holding global

View File

@@ -1,4 +1,4 @@
@c Copyright (C) 2008--2024 Free Software Foundation, Inc.
@c Copyright (C) 2008--2025 Free Software Foundation, Inc.
@c Permission is granted to copy, distribute and/or modify this document
@c under the terms of the GNU Free Documentation License, Version 1.3 or
@c any later version published by the Free Software Foundation; with the
@@ -6046,6 +6046,11 @@ The block containing this block. If this parent block does not exist,
this attribute holds @code{None}. This attribute is not writable.
@end defvar
@defvar Block.subblocks
A list of blocks nested in this block. If there are no blocks nested,
this attribute holds an empty list. This attribute is not writable.
@end defvar
@defvar Block.global_block
The global block associated with this block. This attribute is not
writable.

View File

@@ -1,6 +1,6 @@
/* Python interface to blocks.
Copyright (C) 2008-2024 Free Software Foundation, Inc.
Copyright (C) 2008-2025 Free Software Foundation, Inc.
This file is part of GDB.
@@ -149,6 +149,37 @@ blpy_get_superblock (PyObject *self, void *closure)
Py_RETURN_NONE;
}
/* Implement gdb.Block.subblocks attribute. Return a list of gdb.Block
objects that are direct children of this block. */
static PyObject *
blpy_get_subblocks (PyObject *self, void *closure)
{
const struct block *block;
BLPY_REQUIRE_VALID (self, block);
gdbpy_ref<> list (PyList_New (0));
if (list == nullptr)
return nullptr;
compunit_symtab *cu = block->global_block ()->compunit ();
for (const struct block *each : cu->blockvector ()->blocks ())
{
if (each->superblock () == block)
{
gdbpy_ref<> item (block_to_block_object (each, cu->objfile ()));
if (item.get () == nullptr
|| PyList_Append (list.get (), item.get ()) == -1)
return nullptr;
}
}
return list.release ();
}
/* Return the global block associated to this block. */
static PyObject *
@@ -529,6 +560,8 @@ static gdb_PyGetSetDef block_object_getset[] = {
"Whether this block is a static block.", NULL },
{ "is_global", blpy_is_global, NULL,
"Whether this block is a global block.", NULL },
{ "subblocks", blpy_get_subblocks, nullptr,
"List of blocks contained in this block.", nullptr },
{ NULL } /* Sentinel */
};

View File

@@ -1,4 +1,4 @@
# Copyright (C) 2010-2024 Free Software Foundation, Inc.
# Copyright (C) 2010-2025 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -61,6 +61,10 @@ gdb_py_test_silent_cmd "python sblock = block.static_block" \
"Get block, static_block" 1
gdb_test "python print (gblock.is_global)" "True" "is the global block"
gdb_test "python print (sblock.is_static)" "True" "is the static block"
gdb_test "python print (len(gblock.subblocks) > 0)" "True" \
"global block contains at least one block"
gdb_test "python print (sblock in gblock.subblocks)" "True" \
"global block contains at static block"
# Move up superblock(s) until we reach function block_func.
gdb_test_no_output "python block = block.superblock" "get superblock"