From 28b59491b896a0d0af2946533a1e8f122acda408 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 6 Apr 2023 06:56:11 -0600 Subject: Filter out types from DAP scopes request The DAP scopes request examines the symbols in a block tree, but neglects to omit types. This patch fixes the problem. --- gdb/python/lib/gdb/dap/scopes.py | 2 +- gdb/testsuite/gdb.dap/scopes.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/python/lib/gdb/dap/scopes.py b/gdb/python/lib/gdb/dap/scopes.py index 9ab454a..be4f8fc 100644 --- a/gdb/python/lib/gdb/dap/scopes.py +++ b/gdb/python/lib/gdb/dap/scopes.py @@ -41,7 +41,7 @@ def _block_vars(block): for var in block: if var.is_argument: args.append(var) - else: + elif var.is_variable or var.is_constant: locs.append(var) if block.function is not None: break diff --git a/gdb/testsuite/gdb.dap/scopes.c b/gdb/testsuite/gdb.dap/scopes.c index 7b35036..ce87db1 100644 --- a/gdb/testsuite/gdb.dap/scopes.c +++ b/gdb/testsuite/gdb.dap/scopes.c @@ -15,14 +15,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -struct dei_struct -{ - int x; - int more[5]; -}; - int main () { + struct dei_struct + { + int x; + int more[5]; + }; + struct dei_struct dei = { 2, { 3, 5, 7, 11, 13 } }; static int scalar = 23; -- cgit v1.1