From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CY/8OW2STmq7oiwAWB0awg (envelope-from ) for ; Wed, 08 Jul 2026 14:09:49 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=E/aWRj/y; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E87271E024; Wed, 08 Jul 2026 14:09:49 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id EFDC81E024 for ; Wed, 08 Jul 2026 14:09:45 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C5D024BA2E25 for ; Wed, 8 Jul 2026 18:09:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C5D024BA2E25 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=E/aWRj/y Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by sourceware.org (Postfix) with ESMTPS id C46294BA2E22 for ; Wed, 8 Jul 2026 18:09:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C46294BA2E22 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 C46294BA2E22 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783534157; cv=none; b=w88czFjwxRu8zr9TUxsE95UC6O9aQaxeUKqzb+6oxTXpvu533Igc7460j6uQBfVO1TTkLcy1OL1f8lnhW10nmWabr6Liof+aNH7vO0Is+yS5q4DBrFEtiqOcA+5/XXPNzTOxtmSqKqgzx+fIJkkcxA/j/nSFXVBX3PfDEGzvHgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783534157; c=relaxed/simple; bh=2OPrNbVoek5PpPysyP3SpxX25UlMs771VIxndjnT3HQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=MRPnazfju32T9XLJVPv/6U5v7lfBr6b4R6YlniR6dOe7poBnNEsY6AwKh8sGHlIZawNM0YD8J7jKBSph5CdFOlX0AiCuFEbmlS3m6qEc7frN+RumzWiCbmgdvs+58PxTi1CQZX7VB6IN4TJkK+8+lVKodQKGX2dDvJovy9vEzH8= ARC-Authentication-Results: i=1; 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=E/aWRj/y DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C46294BA2E22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1783534158; x=1815070158; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2OPrNbVoek5PpPysyP3SpxX25UlMs771VIxndjnT3HQ=; b=E/aWRj/ylqmswL5mMXbTK0boLuz0ti/Ae0zEox2qL/CpMYJmHvkwqdfc WLiDI8TAep1JY78HhpdS7a8SbljFGyTonIF23lnJVFVXzcjyVymC+4Fq1 C/ycuXW8A9BRFqklUOH+U+wFCWZsmydNpHbzSs35csgrmTOh9bFGhkDRu yefn4nyAUTqXkBzyubt3ECIn3Rwk8YmrKCCEtD/3V48/dsxOYcSrW0lvf bk+2CN8QCDgjDbUvmjVediZoZsd6Jg8MIztWrdhN1+pOoTgDBQSMdaTSG JLOjWX1Hqc7oG/zXeIqo8Zk07Sqxki03c4aw1NJeVUexdAPEt9qF2WPio Q==; X-CSE-ConnectionGUID: N+iUP8/jQOuUd6NJk6Gctg== X-CSE-MsgGUID: BFEvZg+cQK6qF9BI9liS7w== X-IronPort-AV: E=McAfee;i="6800,10657,11841"; a="107002552" X-IronPort-AV: E=Sophos;i="6.25,153,1779174000"; d="scan'208";a="107002552" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2026 11:09:16 -0700 X-CSE-ConnectionGUID: W0GR6gDtQHy/aUjfcsRBhQ== X-CSE-MsgGUID: Ibwz6EKUSjiLYpWi1afJfQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,153,1779174000"; d="scan'208";a="256275321" Received: from srabe-mobl.ger.corp.intel.com (HELO localhost) ([10.245.80.174]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2026 11:09:12 -0700 From: Abdul Basit Ijaz To: gdb-patches@sourceware.org Cc: pedro@palves.net, philippe.waroquiers@skynet.be, aburgess@redhat.com, christina.schimpe@intel.com, lsix@lancelotsix.com, eliz@gnu.org, abdul.b.ijaz@intel.com, guinevere@redhat.com Subject: [PATCH v13 2/2] gdb: add shadowed field in '-stack-list-locals/variables' mi commands Date: Wed, 8 Jul 2026 20:08:05 +0200 Message-Id: <20260708180805.207722-3-abdul.b.ijaz@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260708180805.207722-1-abdul.b.ijaz@intel.com> References: <20260708180805.207722-1-abdul.b.ijaz@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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~public-inbox=simark.ca@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 informat= ion 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 =3D 42; 2: { 3: int x =3D 99; 4: int y =3D 52; 5: x =3D 99; /* break here */ 6: } 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=3D[name=3D"x",name=3D"y",name=3D"x"] (gdb) -stack-list-locals 1 ^done,locals=3D[{name=3D"x",value=3D"99"},{name=3D"y",value=3D"52"},{name= =3D"x",value=3D"42"}] (gdb) -stack-list-locals 2 ^done,locals=3D[{name=3D"x",type=3D"int",value=3D"99"},{name=3D"y",type=3D"= int",value=3D"52"},{name=3D"x",type=3D"int",value=3D"42"}] (gdb) -stack-list-variables 0 ^done,variables=3D[{name=3D"x"},{name=3D"y"},{name=3D"x"}] (gdb) -stack-list-variables 1 ^done,variables=3D[{name=3D"x",value=3D"99"},{name=3D"y",value=3D"52"},{nam= e=3D"x",value=3D"42"}] (gdb) -stack-list-variables 2 ^done,variables=3D[{name=3D"x",type=3D"int",value=3D"99"},{name=3D"y",type= =3D"int",value=3D"52"},{name=3D"x",type=3D"int",value=3D"42"}] ~~~ With this patch we obtain: ~~~ (gdb) -stack-list-locals 0 ^done,locals=3D[name=3D"x",name=3D"y",name=3D"x"] (gdb) -stack-list-locals 1 ^done,locals=3D[{name=3D"x",value=3D"99",file=3D"/home/src/test.c",line=3D"= 5"},{name=3D"y",value=3D"52"},{name=3D"x",value=3D"42",file=3D"/home/src/te= st.c",line=3D"2",shadowed=3D"true"}] (gdb) -stack-list-locals 2 ^done,locals=3D[{name=3D"x",type=3D"int",value=3D"99",file=3D"/home/src/tes= t.c",line=3D"5"},{name=3D"y",type=3D"int",value=3D"52"},{name=3D"x",type=3D= "int",value=3D"42",file=3D"/home/src/test.c",line=3D"2",shadowed=3D"true"}] (gdb) -stack-list-variables 0 ^done,variables=3D[{name=3D"x",file=3D"/home/src/test.c",line=3D"5"},{name= =3D"y"},{name=3D"x",file=3D"/home/src/test.c",line=3D"2",shadowed=3D"true"}] (gdb) -stack-list-variables 1 ^done,variables=3D[{name=3D"x",value=3D"99",file=3D"/home/src/test.c",line= =3D"4"},{name=3D"y",value=3D"52"},{name=3D"x",value=3D"42",file=3D"/home/sr= c/test.c",line=3D"2",shadowed=3D"true"}] (gdb) -stack-list-variables 2 ^done,variables=3D[{name=3D"x",type=3D"int",value=3D"99",file=3D"/home/src/= test.c",line=3D"4"},{name=3D"y",type=3D"int",value=3D"52"},{name=3D"x",type= =3D"int",value=3D"42",file=3D"/home/src/test.c",line=3D"2",shadowed=3D"true= "}] ~~~ Reviewed-By: Guinevere Larsen --- gdb/NEWS | 4 + gdb/doc/gdb.texinfo | 21 ++++ gdb/mi/mi-cmd-stack.c | 129 ++++++++++++++------ gdb/testsuite/gdb.mi/mi-var-shadowing.c | 50 ++++++++ gdb/testsuite/gdb.mi/mi-var-shadowing.exp | 141 ++++++++++++++++++++++ 5 files changed, 310 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 6807a6c966b..483d2013e41 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -593,6 +593,10 @@ multi-wp-addr in qSupported 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 ee33bfdba13..64a1345e2f2 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -35585,6 +35585,27 @@ If the @code{--skip-unavailable} option is specifi= ed, local variables and arguments that are not available are not listed. Partially available arguments and local variables are still displayed, however. = +@smallexample +@group +1: int x =3D 3; +2: @{ +3: int x =3D 4; +4: int y =3D 5; +4: x =3D 99; // breakpoint-line +5: @} +@end group +@group +(gdb) -stack-list-variables 2 +^done,variables=3D[@{name=3D"x",type=3D"int",value=3D"4", +file=3D"/home/src/name.c",line=3D"3"@},@{name=3D"y",type=3D"int",value=3D"= 5", +file=3D"/home/src/name.c",line=3D"4"@},@{name=3D"x",type=3D"int",value=3D"= 3", +file=3D"/home/src/name.c",line=3D"1",shadowed=3D"true"@}] +@end group +@end smallexample + +The location information and @samp{shadowed} attribute is only added +for shadowed variables (@pxref{shadowed variables}). + @subsubheading Example = @smallexample diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 280a08d121e..38955cc697b 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -32,6 +32,7 @@ #include "mi-parse.h" #include #include "inferior.h" +#include "gdbsupport/unordered_map.h" = enum what_to_list { locals, arguments, all }; = @@ -490,7 +491,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 =3D current_uiout; = @@ -519,6 +522,19 @@ list_arg_or_local (const struct frame_arg *arg, enum w= hat_to_list what, tuple_emitter.emplace (uiout, nullptr); = string_file stb; + const char *name =3D arg->sym->print_name (); + /* To distinguish innermost variable from the rest in the shadowed_vars + this boolen is needed. */ + bool already_printed =3D !printed_vars.insert (name).second; + bool shadowed =3D shadowed_vars->find (name) !=3D 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) + =3D=3D lang_vars_shadowing::HIDE && shadowed && already_printed) + return; = stb.puts (arg->sym->print_name ()); if (arg->entry_kind =3D=3D print_entry_values_only) @@ -560,6 +576,59 @@ list_arg_or_local (const struct frame_arg *arg, enum w= hat_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) + =3D=3D lang_vars_shadowing::PRINT && shadowed + && !(values =3D=3D PRINT_NO_VALUES && what =3D=3D locals)) + { + uiout->field_string ("file", arg->sym->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 =3D false; + + switch (sym->loc_class ()) + { + 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 =3D 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 =3D=3D all) + print_me =3D true; + else if (what =3D=3D locals) + print_me =3D !sym->is_argument (); + else + print_me =3D sym->is_argument (); + break; + } + + return print_me; } = /* Print a list of the objects for the frame FI in a certain form, @@ -573,9 +642,10 @@ list_args_or_locals (const frame_print_options &fp_opt= s, 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 =3D current_uiout; + gdb::unordered_set collected_vars, shadowed_vars, printed_v= ars; = block =3D get_frame_block (fi, 0); = @@ -596,42 +666,31 @@ list_args_or_locals (const frame_print_options &fp_op= ts, = ui_out_emit_list list_emitter (uiout, name_of_result); = - while (block !=3D 0) + orig_block =3D block; + /* Stored list of shadowed variables later help in identifying them + from the rest. */ + while (block !=3D nullptr) { for (struct symbol *sym : block_iterator_range (block)) { - int print_me =3D 0; - - switch (sym->loc_class ()) + 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 =3D 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 =3D=3D all) - print_me =3D 1; - else if (what =3D=3D locals) - print_me =3D !sym->is_argument (); - else - print_me =3D sym->is_argument (); - break; + const char *name =3D sym->print_name (); + if (!collected_vars.insert (name).second) + shadowed_vars.insert (name); } - if (print_me) + } + if (block->function ()) + break; + block =3D block->superblock (); + } + + block =3D orig_block; + while (block !=3D 0) + { + for (struct symbol *sym : block_iterator_range (block)) + { + if (can_print_aclass (sym, what)) { struct frame_arg arg, entryarg; = @@ -657,10 +716,10 @@ list_args_or_locals (const frame_print_options &fp_op= ts, = if (arg.entry_kind !=3D 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 !=3D 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..875e753b485 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-var-shadowing.c @@ -0,0 +1,50 @@ +/* Copyright (C) 2023-2026 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 + +int +shadowing (void) +{ + int a =3D 100; /* entry bp */ + unsigned int val1 =3D 1; /* val1-d1 */ + unsigned int val2 =3D 2; /* val2-d1 */ + a =3D 101; /* bp for locals 1 */ + { + unsigned int val2 =3D 3; /* val2-d2 */ + unsigned int val3 =3D 4; /* val3-d1 */ + a =3D 102; /* bp for locals 2 */ + { + unsigned int val1 =3D 5; /* val1-d2 */ + a =3D 103; /* bp for locals 3 */ + { + unsigned int val1 =3D 6; /* val1-d3 */ + unsigned int val2 =3D 7; /* val2-d3 */ + unsigned int val3 =3D 8; /* val3-d2 */ + a =3D 104; /* bp for locals 4 */ + } + } + } + a =3D 105; + + return 0; /* 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..f88c8c81736 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-var-shadowing.exp @@ -0,0 +1,141 @@ +# Copyright 2023-2026 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=3Dmi" + +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)=3D\\\[\{name=3D\"a\",type= =3D\"int\",value=3D\"$decimal\"\},\{name=3D\"val1\",type=3D\"unsigned int\"= ,value=3D\"1\"\},{name=3D\"val2\",type=3D\"unsigned int\",value=3D\"2\"\}\\= \]" +set stack_test2_regx "\\^done,(locals|variables)=3D\\\[\{name=3D\"val2\",t= ype=3D\"unsigned int\",value=3D\"3\",file=3D\"$srcdir/$subdir/$srcfile\",li= ne=3D\"$val2_d2\"\},\{name=3D\"val3\",type=3D\"unsigned int\",value=3D\"4\"= \},\{name=3D\"a\",type=3D\"int\",value=3D\"101\"\},\{name=3D\"val1\",type= =3D\"unsigned int\",value=3D\"1\"\},\{name=3D\"val2\",type=3D\"unsigned int= \",value=3D\"2\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val2_d1\",sh= adowed=3D\"true\"\}\\\]" +set stack_test3_regx "\\^done,(locals|variables)=3D\\\[\{name=3D\"val1\",t= ype=3D\"unsigned int\",value=3D\"5\",file=3D\"$srcdir/$subdir/$srcfile\",li= ne=3D\"$val1_d2\"\},\{name=3D\"val2\",type=3D\"unsigned int\",value=3D\"3\"= ,file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val2_d2\"\},\{name=3D\"val3\= ",type=3D\"unsigned int\",value=3D\"4\"\},\{name=3D\"a\",type=3D\"int\",val= ue=3D\"102\"\},\{name=3D\"val1\",type=3D\"unsigned int\",value=3D\"1\",file= =3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val1_d1\",shadowed=3D\"true\"\},\= {name=3D\"val2\",type=3D\"unsigned int\",value=3D\"2\",file=3D\"$srcdir/$su= bdir/$srcfile\",line=3D\"$val2_d1\",shadowed=3D\"true\"\}\\\]" +set stack_test4_regx "\\^done,(locals|variables)=3D\\\[\{name=3D\"val1\",t= ype=3D\"unsigned int\",value=3D\"6\",file=3D\"$srcdir/$subdir/$srcfile\",li= ne=3D\"$val1_d3\"\},\{name=3D\"val2\",type=3D\"unsigned int\",value=3D\"7\"= ,file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val2_d3\"\},\{name=3D\"val3\= ",type=3D\"unsigned int\",value=3D\"8\",file=3D\"$srcdir/$subdir/$srcfile\"= ,line=3D\"$val3_d2\"\},\{name=3D\"val1\",type=3D\"unsigned int\",value=3D\"= 5\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val1_d2\",shadowed=3D\"tr= ue\"\},\{name=3D\"val2\",type=3D\"unsigned int\",value=3D\"3\",file=3D\"$sr= cdir/$subdir/$srcfile\",line=3D\"$val2_d2\",shadowed=3D\"true\"\},\{name=3D= \"val3\",type=3D\"unsigned int\",value=3D\"4\",file=3D\"$srcdir/$subdir/$sr= cfile\",line=3D\"$val3_d1\",shadowed=3D\"true\"\},\{name=3D\"a\",type=3D\"i= nt\",value=3D\"103\"\},\{name=3D\"val1\",type=3D\"unsigned int\",value=3D\"= 1\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val1_d1\",shadowed=3D\"tr= ue\"\},\{name=3D\"val2\",type=3D\"unsigned int\",value=3D\"2\",file=3D\"$sr= cdir/$subdir/$srcfile\",line=3D\"$val2_d1\",shadowed=3D\"true\"\}\\\]" +set stack_test5_regx "\\^done,(locals|variables)=3D\\\[\{name=3D\"a\",type= =3D\"int\",value=3D\"105\"\},\{name=3D\"val1\",type=3D\"unsigned int\",valu= e=3D\"1\"\},\{name=3D\"val2\",type=3D\"unsigned int\",value=3D\"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=3D\"keep\"" } "continue to outermost level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=3D\\\[name=3D\"a\",name=3D\"val1\",name=3D\"val2\"\\\]= " \ + "-stack-list-locals 0 at outermost level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=3D\\\[{name=3D\"a\"},{name=3D\"val1\"},{name=3D\"va= l2\"}\\\]" \ + "-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=3D\"keep\"" } "continue to first level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=3D\\\[name=3D\"val2\",name=3D\"val3\",name=3D\"a\",nam= e=3D\"val1\",name=3D\"val2\"\\\]" \ + "-stack-list-locals 0 at first level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=3D\\\[{name=3D\"val2\",file=3D\"$srcdir/$subdir/$sr= cfile\",line=3D\"$val2_d2\"},{name=3D\"val3\"},{name=3D\"a\"},{name=3D\"val= 1\"},{name=3D\"val2\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val2_d1= \",shadowed=3D\"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=3D\"keep\"" } "continue to second level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=3D\\\[name=3D\"val1\",name=3D\"val2\",name=3D\"val3\"= ,name=3D\"a\",name=3D\"val1\",name=3D\"val2\"\\\]" \ + "-stack-list-locals 0 at second level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=3D\\\[{name=3D\"val1\",file=3D\"$srcdir/$subdir/$s= rcfile\",line=3D\"$val1_d2\"},{name=3D\"val2\",file=3D\"$srcdir/$subdir/$sr= cfile\",line=3D\"$val2_d2\"},{name=3D\"val3\"},{name=3D\"a\"},{name=3D\"val= 1\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val1_d1\",shadowed=3D\"tr= ue\"\},{name=3D\"val2\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val2_= d1\",shadowed=3D\"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=3D\"keep\"" } "continue to third level" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=3D\\\[name=3D\"val1\",name=3D\"val2\",name=3D\"val3\",= name=3D\"val1\",name=3D\"val2\",name=3D\"val3\",name=3D\"a\",name=3D\"val1\= ",name=3D\"val2\"\\\]" \ + "-stack-list-locals 0 at third level" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=3D\\\[{name=3D\"val1\",file=3D\"$srcdir/$subdir/$sr= cfile\",line=3D\"$val1_d3\"},{name=3D\"val2\",file=3D\"$srcdir/$subdir/$src= file\",line=3D\"$val2_d3\"},{name=3D\"val3\",file=3D\"$srcdir/$subdir/$srcf= ile\",line=3D\"$val3_d2\"},{name=3D\"val1\",file=3D\"$srcdir/$subdir/$srcfi= le\",line=3D\"$val1_d2\",shadowed=3D\"true\"\},\{name=3D\"val2\",file=3D\"$= srcdir/$subdir/$srcfile\",line=3D\"$val2_d2\",shadowed=3D\"true\"\},\{name= =3D\"val3\",file=3D\"$srcdir/$subdir/$srcfile\",line=3D\"$val3_d1\",shadowe= d=3D\"true\"\},{name=3D\"a\"},{name=3D\"val1\",file=3D\"$srcdir/$subdir/$sr= cfile\",line=3D\"$val1_d1\",shadowed=3D\"true\"\},{name=3D\"val2\",file=3D\= "$srcdir/$subdir/$srcfile\",line=3D\"$val2_d1\",shadowed=3D\"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=3D\"keep\"" } "continue to outermost level last" +mi_gdb_test "-stack-list-locals 0" \ + "\\^done,locals=3D\\\[name=3D\"a\",name=3D\"val1\",name=3D\"val2\"\\\]= " \ + "-stack-list-locals 0 at outermost level last" +mi_gdb_test "-stack-list-variables 0" \ + "\\^done,variables=3D\\\[{name=3D\"a\"},{name=3D\"val1\"},{name=3D\"va= l2\"}\\\]" \ + "-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" -- = 2.34.1 Intel Deutschland GmbH Registered Address: Dornacher Strasse 1, 85622 Feldkirchen, Germany Tel: +49 89 991 430, www.intel.de Managing Directors: Harry Demas, Jeffrey Schneiderman, Yin Chong Sorrell Chairperson of the Supervisory Board: Nicole Lau Registered Seat: Munich Commercial Register: Amtsgericht Muenchen HRB 186928