From patchwork Mon Apr 7 14:41:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ijaz, Abdul B" X-Patchwork-Id: 109984 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 90AA83846094 for ; Mon, 7 Apr 2025 14:43:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90AA83846094 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=IQ/IKDrS X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by sourceware.org (Postfix) with ESMTPS id 2E724384A049 for ; Mon, 7 Apr 2025 14:42:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2E724384A049 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2E724384A049 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744036924; cv=none; b=BXoCF1DZAXYpGP7xKv3jYctumq4+5kdcWBO/dHCoCms91uqFyDDhtJy475tOli92UXV4uwFd0QUMP1pvcAporPdVX2sBcCSSw/qLlgtzeC9DQyf15oNPkQKDk0nFyOwaBn3WAe5MyCvMX6dsNT6P3rQTxyRi1x0Z4AB89D6TBfw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744036924; c=relaxed/simple; bh=I3kzKL74G2hYETnvXc/rIdh8axTFiAfvSCSr9zRqsV0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Fj8rj+fWbicY14tk9urNmd9CA86ngs708bI5ufWEn1Tn9AIdjZn+m+B+apgQ3dkPF4ek8vMO+YL23tXilWjM/ZR0EK0mU+9yuhgi4caO5Xup1XEjqy7oTuLW8jP7zU4WrVDSRfJIQ3SjgZIwhqwev8CjbjrPrL3X/4XNkwx75NI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E724384A049 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744036924; x=1775572924; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I3kzKL74G2hYETnvXc/rIdh8axTFiAfvSCSr9zRqsV0=; b=IQ/IKDrS5LHzYGfpvsZrzKbeKQZ3DGv+2eegwucHmWoSi0knxrfrvWg8 X3dYdDRFgl0ezLOQNSrMjTbOqOZhHflXnRxsivz8U4/gE4iItt+wLMI25 1B9mXBItIdFYzeQmho0nW6vpqpIbyh0NxRuX7onh+ytgWth8aCOKDvGs7 YYfwqiA5FlSHzN8SbTefv9F1fXJWe3GpehhkMcG/30M8D2n806Hy9z1pm ZuDsSLqowyc9NeMkdw3CR1VCFKTJkS0BUpi39d5pjjSky9O9IhvPg46kJ 6iw1N7Rh/dCOE+bADeK1hdPNb+giKEX9xKFCENT2fXuEkOOpVczcX5rn0 g==; X-CSE-ConnectionGUID: 4la9TImRTlWBkJWfovoVGg== X-CSE-MsgGUID: O7/Vy9XLRXWW/ne73zhGLA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="44572865" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="44572865" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 07:42:03 -0700 X-CSE-ConnectionGUID: U23O/mtYRWegra6OlaWqKg== X-CSE-MsgGUID: OFW9BpFjRCmLET7ysMITLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="158964373" Received: from abijaz-mobl2.ger.corp.intel.com (HELO localhost) ([10.246.33.121]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 07:41:58 -0700 From: Abdul Basit Ijaz To: gdb-patches@sourceware.org Cc: pedro@palves.net, philippe.waroquiers@skynet.be, aburgess@redhat.com, tankut.baris.aktemur@intel.com, christina.schimpe@intel.com, lsix@lancelotsix.com, eliz@gnu.org, abdul.b.ijaz@intel.com, tom@tromey.com Subject: [PATCH v10 2/2] gdb: add shadowed field in '-stack-list-locals/variables' mi commands Date: Mon, 7 Apr 2025 16:41:04 +0200 Message-Id: <20250407144104.3374-3-abdul.b.ijaz@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407144104.3374-1-abdul.b.ijaz@intel.com> References: <20250407144104.3374-1-abdul.b.ijaz@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org From: "Ijaz, Abdul B" For C/C++/Fortran languages GDB prints same name variable multiple times in case of variable shadowing and it is confusing for user to identify which variable belongs to the current scope. So GDB now prints location information for shadowed variables and add 'shadowed' field also in '-stack-list-locals' and '-stack-list-variables' mi commands for super-block shadowed variable. Suppose we have test.c file 1:int x = 42; 2: { 3: int x = 99; 4: int y = 52; 4: x = 99; /* break here */ 5: } The "-stack-list-locals" and "-stack-list-variables" mi commands at the "break here" line gives the following output: Before the change: ~~~ (gdb) -stack-list-locals 0 ^done,locals=[name="x",name="y",name="x"] (gdb) -stack-list-locals 1 ^done,locals=[{name="x",value="99"},{name="y",value="52"},{name="x",value="42"}] (gdb) -stack-list-locals 2 ^done,locals=[{name="x",type="int",value="99"},{name="y",type="int",value="52"},{name="x",type="int",value="42"}] (gdb) -stack-list-variables 0 ^done,variables=[{name="x"},{name="y"},{name="x"}] (gdb) -stack-list-variables 1 ^done,variables=[{name="x",value="99"},{name="y",value="52"},{name="x",value="42"}] (gdb) -stack-list-variables 2 ^done,variables=[{name="x",type="int",value="99"},{name="y",type="int",value="52"},{name="x",type="int",value="42"}] ~~~ With this patch we obtain: ~~~ (gdb) -stack-list-locals 0 ^done,locals=[name="x",name="y",name="x"] (gdb) -stack-list-locals 1 ^done,locals=[{name="x",value="99",file="/home/src/test.c",line="4"},{name="y",value="52"},{name="x",value="42",file="/home/src/test.c",line="2",shadowed="true"}] (gdb) -stack-list-locals 2 ^done,locals=[{name="x",type="int",value="99",file="/home/src/test.c",line="4"},{name="y",type="int",value="52"},{name="x",type="int",value="42",file="/home/src/test.c",line="2",shadowed="true"}] (gdb) -stack-list-variables 0 ^done,variables=[{name="x",file="/home/src/test.c",line="4"},{name="y"},{name="x",file="/home/src/test.c",line="2",shadowed="true"}] (gdb) -stack-list-variables 1 ^done,variables=[{name="x",value="99",file="/home/src/test.c",line="4"},{name="y",value="52"},{name="x",value="42",file="/home/src/test.c",line="2",shadowed="true"}] (gdb) -stack-list-variables 2 ^done,variables=[{name="x",type="int",value="99",file="/home/src/test.c",line="4"},{name="y",type="int",value="52"},{name="x",type="int",value="42",file="/home/src/test.c",line="2",shadowed="true"}] ~~~ --- gdb/NEWS | 4 + gdb/doc/gdb.texinfo | 18 +++ gdb/mi/mi-cmd-stack.c | 129 ++++++++++++++------ gdb/testsuite/gdb.mi/mi-var-shadowing.c | 48 ++++++++ gdb/testsuite/gdb.mi/mi-var-shadowing.exp | 141 ++++++++++++++++++++++ 5 files changed, 305 insertions(+), 35 deletions(-) create mode 100644 gdb/testsuite/gdb.mi/mi-var-shadowing.c create mode 100644 gdb/testsuite/gdb.mi/mi-var-shadowing.exp diff --git a/gdb/NEWS b/gdb/NEWS index 730d68b5dcd..63df5feaa07 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -113,6 +113,10 @@ qXfer:threads:read multiple times, and the same mapping was being reused. In all other cases, this field will have the value 'false'. +** GDB now shows "shadowed", "file" and "line" fields in the output + of '-stack-list-locals/variables' mi commands for variables + shadowing case. + * Support for stabs debugging format and the a.out/dbx object format is deprecated, and will be removed in GDB 18. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 129baf93f77..9b4ec5938d1 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -35184,6 +35184,24 @@ If the @code{--skip-unavailable} option is specified, local variables and arguments that are not available are not listed. Partially available arguments and local variables are still displayed, however. +@smallexample +1: int x = 3; +2: @{ +3: int x = 4; +4: int y = 5; +4: x = 99; // breakpoint-line +5: @} +(gdb) -stack-list-variables 2 +^done,variables=[@{name="x",type="int",value="4",file="/home/src/name.c",line="3"@},@{name="y",type="int",value="5",file="/home/src/name.c",line="4"@},@{name="x",type="int",value="3",file="/home/src/name.c",line="1",shadowed="true"@}] +@end smallexample + +A variable is shadowed when there's another variable with the same +name which is declared within an inner scope (decision block, +method, or inner class). For such cases, its location for the +outermost scope is followed by @samp{shadowed} attribute. The +location can help to locate the instances of shadowed variables. So, +location information is only added for shadowed variables. + @subsubheading Example @smallexample diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 05bc0ffce27..ec4d89cb626 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -34,6 +34,7 @@ #include #include "gdbsupport/gdb-safe-ctype.h" #include "inferior.h" +#include "gdbsupport/unordered_map.h" enum what_to_list { locals, arguments, all }; @@ -492,7 +493,9 @@ mi_cmd_stack_list_variables (const char *command, const char *const *argv, static void list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, enum print_values values, int skip_unavailable, - const frame_print_options &fp_opts) + const frame_print_options &fp_opts, + const gdb::unordered_set *shadowed_vars, + gdb::unordered_set &printed_vars) { struct ui_out *uiout = current_uiout; @@ -521,6 +524,19 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, tuple_emitter.emplace (uiout, nullptr); string_file stb; + const char *name = arg->sym->print_name (); + /* To distinguish innermost variable from the rest in the shadowed_vars + this boolen is needed. */ + bool already_printed = !printed_vars.insert (name).second; + bool shadowed = shadowed_vars->find (name) != shadowed_vars->end (); + + /* In case of Rust language it is possible to declare variable with + same name multiple times and only latest declaration of variable + is accessible. So print only the first instance and there is no + need of printing duplicates. */ + if (get_lang_vars_shadowing_option (current_language->la_language) + == lang_vars_shadowing::RETURN && shadowed && already_printed) + return; stb.puts (arg->sym->print_name ()); if (arg->entry_kind == print_entry_values_only) @@ -562,6 +578,59 @@ list_arg_or_local (const struct frame_arg *arg, enum what_to_list what, } uiout->field_stream ("value", stb); } + + /* Only for C/C++/Fortran/Ada languages, in case of variables shadowing + print shadowed field after the superblock variable and only location + of the variables in the innerblock. */ + if (get_lang_vars_shadowing_option (current_language->la_language) + == lang_vars_shadowing::PRINT && shadowed + && !(values == PRINT_NO_VALUES && what == locals)) + { + uiout->field_string ("file", arg->sym->owner.symtab->filename); + uiout->field_unsigned ("line", arg->sym->m_line); + if (already_printed) + uiout->field_string ("shadowed", "true"); + } +} + +/* Returns true if address_class can be printed, otherwise returns false. */ + +static bool +can_print_aclass (struct symbol *sym, enum what_to_list what) +{ + int print_me = false; + + switch (sym->aclass ()) + { + default: + case LOC_UNDEF: /* catches errors */ + case LOC_CONST: /* constant */ + case LOC_TYPEDEF: /* local typedef */ + case LOC_LABEL: /* local label */ + case LOC_BLOCK: /* local function */ + case LOC_CONST_BYTES: /* loc. byte seq. */ + case LOC_UNRESOLVED: /* unresolved static */ + case LOC_OPTIMIZED_OUT: /* optimized out */ + print_me = false; + break; + + case LOC_ARG: /* argument */ + case LOC_REF_ARG: /* reference arg */ + case LOC_REGPARM_ADDR: /* indirect register arg */ + case LOC_LOCAL: /* stack local */ + case LOC_STATIC: /* static */ + case LOC_REGISTER: /* register */ + case LOC_COMPUTED: /* computed location */ + if (what == all) + print_me = true; + else if (what == locals) + print_me = !sym->is_argument (); + else + print_me = sym->is_argument (); + break; + } + + return print_me; } /* Print a list of the objects for the frame FI in a certain form, @@ -575,9 +644,10 @@ list_args_or_locals (const frame_print_options &fp_opts, enum what_to_list what, enum print_values values, const frame_info_ptr &fi, int skip_unavailable) { - const struct block *block; + const struct block *block, *orig_block; const char *name_of_result; struct ui_out *uiout = current_uiout; + gdb::unordered_set collected_vars, shadowed_vars, printed_vars; block = get_frame_block (fi, 0); @@ -598,42 +668,31 @@ list_args_or_locals (const frame_print_options &fp_opts, ui_out_emit_list list_emitter (uiout, name_of_result); - while (block != 0) + orig_block = block; + /* Stored list of shadowed variables later help in identifying them + from the rest. */ + while (block != nullptr) { for (struct symbol *sym : block_iterator_range (block)) { - int print_me = 0; - - switch (sym->aclass ()) + if (can_print_aclass (sym, what)) { - default: - case LOC_UNDEF: /* catches errors */ - case LOC_CONST: /* constant */ - case LOC_TYPEDEF: /* local typedef */ - case LOC_LABEL: /* local label */ - case LOC_BLOCK: /* local function */ - case LOC_CONST_BYTES: /* loc. byte seq. */ - case LOC_UNRESOLVED: /* unresolved static */ - case LOC_OPTIMIZED_OUT: /* optimized out */ - print_me = 0; - break; - - case LOC_ARG: /* argument */ - case LOC_REF_ARG: /* reference arg */ - case LOC_REGPARM_ADDR: /* indirect register arg */ - case LOC_LOCAL: /* stack local */ - case LOC_STATIC: /* static */ - case LOC_REGISTER: /* register */ - case LOC_COMPUTED: /* computed location */ - if (what == all) - print_me = 1; - else if (what == locals) - print_me = !sym->is_argument (); - else - print_me = sym->is_argument (); - break; + const char *name = sym->print_name (); + if (!collected_vars.insert (name).second) + shadowed_vars.insert (name); } - if (print_me) + } + if (block->function ()) + break; + block = block->superblock (); + } + + block = orig_block; + while (block != 0) + { + for (struct symbol *sym : block_iterator_range (block)) + { + if (can_print_aclass (sym, what)) { struct symbol *sym2; struct frame_arg arg, entryarg; @@ -668,10 +727,10 @@ list_args_or_locals (const frame_print_options &fp_opts, if (arg.entry_kind != print_entry_values_only) list_arg_or_local (&arg, what, values, skip_unavailable, - fp_opts); + fp_opts, &shadowed_vars, printed_vars); if (entryarg.entry_kind != print_entry_values_no) list_arg_or_local (&entryarg, what, values, skip_unavailable, - fp_opts); + fp_opts, &shadowed_vars, printed_vars); } } diff --git a/gdb/testsuite/gdb.mi/mi-var-shadowing.c b/gdb/testsuite/gdb.mi/mi-var-shadowing.c new file mode 100644 index 00000000000..d01717099e1 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-var-shadowing.c @@ -0,0 +1,48 @@ +/* Copyright (C) 2023-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 + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +void +shadowing (void) +{ + int a = 100; /* entry bp */ + unsigned int val1 = 1; /* val1-d1 */ + unsigned int val2 = 2; /* val2-d1 */ + a = 101; /* bp for locals 1 */ + { + unsigned int val2 = 3; /* val2-d2 */ + unsigned int val3 = 4; /* val3-d1 */ + a = 102; /* bp for locals 2 */ + { + unsigned int val1 = 5; /* val1-d2 */ + a = 103; /* bp for locals 3 */ + { + unsigned int val1 = 6; /* val1-d3 */ + unsigned int val2 = 7; /* val2-d3 */ + unsigned int val3 = 8; /* val3-d2 */ + a = 104; /* bp for locals 4 */ + } + } + } + a = 105; +} /* bp for locals 5 */ + +int +main (void) +{ + shadowing (); + return 0; +} diff --git a/gdb/testsuite/gdb.mi/mi-var-shadowing.exp b/gdb/testsuite/gdb.mi/mi-var-shadowing.exp new file mode 100644 index 00000000000..7114dde56f0 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-var-shadowing.exp @@ -0,0 +1,141 @@ +# Copyright 2023-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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if [mi_gdb_start] { + continue +} + +standard_testfile + +set opts {debug} +if [build_executable ${testfile}.exp ${testfile} ${srcfile} $opts] { + return -1 +} + +mi_delete_breakpoints +mi_gdb_reinitialize_dir $srcdir/$subdir +mi_gdb_load ${binfile} +mi_runto main + +set bp_line1 [gdb_get_line_number "bp for locals 1"] +set bp_line2 [gdb_get_line_number "bp for locals 2"] +set bp_line3 [gdb_get_line_number "bp for locals 3"] +set bp_line4 [gdb_get_line_number "bp for locals 4"] +set bp_line5 [gdb_get_line_number "bp for locals 5"] + +set val1_d1 [gdb_get_line_number "val1-d1"] +set val1_d2 [gdb_get_line_number "val1-d2"] +set val1_d3 [gdb_get_line_number "val1-d3"] +set val2_d1 [gdb_get_line_number "val2-d1"] +set val2_d2 [gdb_get_line_number "val2-d2"] +set val2_d3 [gdb_get_line_number "val2-d3"] +set val3_d1 [gdb_get_line_number "val3-d1"] +set val3_d2 [gdb_get_line_number "val3-d2"] +set a_line [gdb_get_line_number "entry bp"] + +set stack_test1_regx "\\^done,(locals|variables)=\\\[\{name=\"a\",type=\"int\",value=\"$decimal\"\},\{name=\"val1\",type=\"unsigned int\",value=\"1\"\},{name=\"val2\",type=\"unsigned int\",value=\"2\"\}\\\]" +set stack_test2_regx "\\^done,(locals|variables)=\\\[\{name=\"val2\",type=\"unsigned int\",value=\"3\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d2\"\},\{name=\"val3\",type=\"unsigned int\",value=\"4\"\},\{name=\"a\",type=\"int\",value=\"101\"\},\{name=\"val1\",type=\"unsigned int\",value=\"1\"\},\{name=\"val2\",type=\"unsigned int\",value=\"2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d1\",shadowed=\"true\"\}\\\]" +set stack_test3_regx "\\^done,(locals|variables)=\\\[\{name=\"val1\",type=\"unsigned int\",value=\"5\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d2\"\},\{name=\"val2\",type=\"unsigned int\",value=\"3\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d2\"\},\{name=\"val3\",type=\"unsigned int\",value=\"4\"\},\{name=\"a\",type=\"int\",value=\"102\"\},\{name=\"val1\",type=\"unsigned int\",value=\"1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d1\",shadowed=\"true\"\},\{name=\"val2\",type=\"unsigned int\",value=\"2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d1\",shadowed=\"true\"\}\\\]" +set stack_test4_regx "\\^done,(locals|variables)=\\\[\{name=\"val1\",type=\"unsigned int\",value=\"6\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d3\"\},\{name=\"val2\",type=\"unsigned int\",value=\"7\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d3\"\},\{name=\"val3\",type=\"unsigned int\",value=\"8\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val3_d2\"\},\{name=\"val1\",type=\"unsigned int\",value=\"5\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d2\",shadowed=\"true\"\},\{name=\"val2\",type=\"unsigned int\",value=\"3\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d2\",shadowed=\"true\"\},\{name=\"val3\",type=\"unsigned int\",value=\"4\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val3_d1\",shadowed=\"true\"\},\{name=\"a\",type=\"int\",value=\"103\"\},\{name=\"val1\",type=\"unsigned int\",value=\"1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d1\",shadowed=\"true\"\},\{name=\"val2\",type=\"unsigned int\",value=\"2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d1\",shadowed=\"true\"\}\\\]" +set stack_test5_regx "\\^done,(locals|variables)=\\\[\{name=\"a\",type=\"int\",value=\"105\"\},\{name=\"val1\",type=\"unsigned int\",value=\"1\"\},\{name=\"val2\",type=\"unsigned int\",value=\"2\"\}\\\]" + +mi_gdb_test \ + "-break-insert --source ${srcfile} --line ${bp_line1}" \ + "\\^done.*source ${srcfile} \\-line ${bp_line1}.*" \ + "bp at outermost level" +mi_execute_to "exec-continue" "breakpoint-hit" ".*" ".*" ".*" "${bp_line1}" \ + { "" "disp=\"keep\"" } "continue to outermost level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=\\\[name=\"a\",name=\"val1\",name=\"val2\"\\\]" \ + "-stack-list-locals 0 at outermost level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=\\\[{name=\"a\"},{name=\"val1\"},{name=\"val2\"}\\\]" \ + "-stack-list-variables 0 at outermost level" +mi_gdb_test "-stack-list-locals 2" "${stack_test1_regx}" \ + "-stack-list-locals 2 at outermost level" +mi_gdb_test "-stack-list-variables 2" "${stack_test1_regx}" \ + "-stack-list-variables 2 at outermost level" + +mi_gdb_test \ + "-break-insert --source ${srcfile} --line ${bp_line2}" \ + "\\^done.*source ${srcfile} \\-line ${bp_line2}.*" \ + "bp at first level" +mi_execute_to "exec-continue" "breakpoint-hit" ".*" ".*" ".*" "${bp_line2}" \ + { "" "disp=\"keep\"" } "continue to first level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=\\\[name=\"val2\",name=\"val3\",name=\"a\",name=\"val1\",name=\"val2\"\\\]" \ + "-stack-list-locals 0 at first level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=\\\[{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d2\"},{name=\"val3\"},{name=\"a\"},{name=\"val1\"},{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d1\",shadowed=\"true\"\}\\\]" \ + "-stack-list-variables 0 at first level" +mi_gdb_test "-stack-list-locals 2" "${stack_test2_regx}" \ + "-stack-list-locals 2 at first level" +mi_gdb_test "-stack-list-variables 2" "${stack_test2_regx}" \ + "-stack-list-variables 2 at first level" + +mi_gdb_test \ + "-break-insert --source ${srcfile} --line ${bp_line3}" \ + "\\^done.*source ${srcfile} \\-line ${bp_line3}.*" \ + "bp at second level" +mi_execute_to "exec-continue" "breakpoint-hit" ".*" ".*" ".*" "${bp_line3}" \ + { "" "disp=\"keep\"" } "continue to second level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=\\\[name=\"val1\",name=\"val2\",name=\"val3\",name=\"a\",name=\"val1\",name=\"val2\"\\\]" \ + "-stack-list-locals 0 at second level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=\\\[{name=\"val1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d2\"},{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d2\"},{name=\"val3\"},{name=\"a\"},{name=\"val1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d1\",shadowed=\"true\"\},{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d1\",shadowed=\"true\"\}\\\]" \ + "-stack-list-variables 0 at second level" +mi_gdb_test "-stack-list-locals 2" "${stack_test3_regx}" \ + "-stack-list-locals 2 at second level" +mi_gdb_test "-stack-list-variables 2" "${stack_test3_regx}" \ + "-stack-list-variables 2 at second level" + +mi_gdb_test \ + "-break-insert --source ${srcfile} --line ${bp_line4}" \ + "\\^done.*source ${srcfile} \\-line ${bp_line4}.*" \ + "bp at third level" +mi_execute_to "exec-continue" "breakpoint-hit" ".*" ".*" ".*" "${bp_line4}" \ + { "" "disp=\"keep\"" } "continue to third level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=\\\[name=\"val1\",name=\"val2\",name=\"val3\",name=\"val1\",name=\"val2\",name=\"val3\",name=\"a\",name=\"val1\",name=\"val2\"\\\]" \ + "-stack-list-locals 0 at third level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=\\\[{name=\"val1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d3\"},{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d3\"},{name=\"val3\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val3_d2\"},{name=\"val1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d2\",shadowed=\"true\"\},\{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d2\",shadowed=\"true\"\},\{name=\"val3\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val3_d1\",shadowed=\"true\"\},{name=\"a\"},{name=\"val1\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val1_d1\",shadowed=\"true\"\},{name=\"val2\",file=\"$srcdir/$subdir/$srcfile\",line=\"$val2_d1\",shadowed=\"true\"\}\\\]" \ + "-stack-list-variables 0 at third level" +mi_gdb_test "-stack-list-locals 2" "${stack_test4_regx}" \ + "-stack-list-locals 2 at third level" +mi_gdb_test "-stack-list-variables 2" "${stack_test4_regx}" \ + "-stack-list-variables 2 at third level" + +mi_gdb_test \ + "-break-insert --source ${srcfile} --line ${bp_line5}" \ + "\\^done.*source ${srcfile} \\-line ${bp_line5}.*" \ + "bp at outermost level last" +mi_execute_to "exec-continue" "breakpoint-hit" ".*" ".*" ".*" "${bp_line5}" \ + { "" "disp=\"keep\"" } "continue to outermost level last" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=\\\[name=\"a\",name=\"val1\",name=\"val2\"\\\]" \ + "-stack-list-locals 0 at outermost level last" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=\\\[{name=\"a\"},{name=\"val1\"},{name=\"val2\"}\\\]" \ + "-stack-list-variables at outermost level last" +mi_gdb_test "-stack-list-locals 2" "${stack_test5_regx}" \ + "-stack-list-locals 2 at outermost level last" +mi_gdb_test "-stack-list-variables 2" "${stack_test5_regx}" \ + "-stack-list-variables 2 at outermost level last"