From patchwork Wed Oct 9 08:42:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdul Basit Ijaz X-Patchwork-Id: 98578 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 49AE2385020F for ; Wed, 9 Oct 2024 08:43:48 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by sourceware.org (Postfix) with ESMTPS id 07B71385020E for ; Wed, 9 Oct 2024 08:43:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 07B71385020E 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 07B71385020E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728463395; cv=none; b=EqiDj1hsp+MBUjdXPMcOaxfH88q5vhMb3rLv6JBLiVMj79LuBHcl2+S38zQsRK4tJeI7o5BJS9Ud4mT7QbUP/53MAnchbWZL6GL7065HtnCggSNmfApzolqqZScp7UxaPOBeQS008Y9otHtmhrcGU/AM/n75aRHZbM5Dcd5LJsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728463395; c=relaxed/simple; bh=RZKfNoc6IyURW8VTqn8+bjj4FNB127Cl9a6eQiXmYMo=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=woo1WMD+0PdBQq3H42PEDbWLKaYNN1Q3fnqpAUug8GJtSyKXP67fWbQGmLzo0O7+Mvhx2LXoo+qkziSNCBKHUvTdAcbVbesEh7BHxOCDVzUiPpd3Fvkbs2xLmNt9Z1Fb/l0invx+7M7UfNO7FIOBrMbtpTM3tCtP1u25Rv3Z410= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728463391; x=1759999391; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RZKfNoc6IyURW8VTqn8+bjj4FNB127Cl9a6eQiXmYMo=; b=IH1tLcpjmlDRpI8W0vbyZJKtWE2FanNQu2HIowKdT6QUsG6zYHTHq05R qnfggU6rWg6mPw72iJu2nSGIAa3D/zE84d+d+64N1KQ83XN8j8OqVsxIL 1cgbi2QBObPsugMhC7gAeSF9Xerd2NJrGyvP/eMadtNkA+uPs06INE29D oeIIr5ftfM5te0b9UepS29feD7nAYYphxmbZG7Usr8AxuYep+MJX6ps1k SysThpK4kSoWDqeQHAd1w/be+CVPm/R8hOMHFIrTpW+TLv2g7i2BK3YO6 TvZlr49pcEegUTpJHZuQY/rJU9r8GgpW1wF8y3kqIS5PQnVCRVG3Ndt96 g==; X-CSE-ConnectionGUID: 6szvb7RVS4ymYU144Zur6g== X-CSE-MsgGUID: YiSvTOBIR3+MuYGhN7SduA== X-IronPort-AV: E=McAfee;i="6700,10204,11219"; a="31638322" X-IronPort-AV: E=Sophos;i="6.11,189,1725346800"; d="scan'208";a="31638322" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2024 01:43:10 -0700 X-CSE-ConnectionGUID: iPQVA5H+SQ6fcmFhfVGBiQ== X-CSE-MsgGUID: wdZX4W+tQDyetjGV2Uj0zQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,189,1725346800"; d="scan'208";a="76281309" Received: from abijaz-mobl2.ger.corp.intel.com (HELO localhost) ([10.245.148.90]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2024 01:43:06 -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 Subject: [PATCH v7 1/2] gdb: add annotation in 'info locals' command for variables shadowing case Date: Wed, 9 Oct 2024 10:42:06 +0200 Message-Id: <20241009084207.1286-2-abdul.b.ijaz@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241009084207.1286-1-abdul.b.ijaz@intel.com> References: <20241009084207.1286-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/Ada 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 for such cases add location info to the innermost listed variables and for super block variables add "shadowed" annotation in the form of "". Suppose we have 1:int x = 42; 2: { 3: int x = 99; 4: int y = 52; 5: x = 99; /* break here */ 6: } Currently: (gdb) info locals x = 99 x = 42 y = 52 After applying this patch, we obtain: (gdb) info locals x = 99 y = 52 x = 42 The patch adds the location annotations by keeping track of inner block and already printed variables to identify shadowing. So, GDB now prints "" for shadowed super-block variables and "" for innermost declarations of such variables only. The location annotations are printed for shadowed variables in case of C/C++/Fortran/Ada languages. In Rust, it is possible to declare a variable with the same name many times. So in this case, just the first instance of the variable is printed. RUST language test "var_reuse.exp" fails with rustc compiler version >= 1.73 so XFAIL is added accordingly. Fix regex expression in gdb.opt/inline-locals.exp test according to this change. Reviewed-By: Eli Zaretskii --- gdb/doc/gdb.texinfo | 16 ++++ gdb/printcmd.c | 13 ++- gdb/stack.c | 64 +++++++++++-- gdb/stack.h | 3 +- gdb/testsuite/gdb.ada/var_shadowing.exp | 39 ++++++++ .../gdb.ada/var_shadowing/var_shadowing.adb | 30 ++++++ gdb/testsuite/gdb.base/var-shadowing.c | 49 ++++++++++ gdb/testsuite/gdb.base/var-shadowing.exp | 92 +++++++++++++++++++ gdb/testsuite/gdb.base/var-shadowing2.c | 16 ++++ gdb/testsuite/gdb.opt/inline-locals.exp | 21 +++-- gdb/testsuite/gdb.rust/var_reuse.exp | 34 +++++++ gdb/testsuite/gdb.rust/var_reuse.rs | 20 ++++ gdb/tracepoint.c | 3 +- gdb/value.h | 4 +- 14 files changed, 385 insertions(+), 19 deletions(-) create mode 100644 gdb/testsuite/gdb.ada/var_shadowing.exp create mode 100644 gdb/testsuite/gdb.ada/var_shadowing/var_shadowing.adb create mode 100755 gdb/testsuite/gdb.base/var-shadowing.c create mode 100755 gdb/testsuite/gdb.base/var-shadowing.exp create mode 100644 gdb/testsuite/gdb.base/var-shadowing2.c create mode 100755 gdb/testsuite/gdb.rust/var_reuse.exp create mode 100755 gdb/testsuite/gdb.rust/var_reuse.rs diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 46ca62ec0c3..cd62756f4a1 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -8888,6 +8888,22 @@ The optional flag @samp{-q}, which stands for @samp{quiet}, disables printing header information and messages explaining why no local variables have been printed. +@smallexample +1: int x = 3; +2: @{ +3: int x = 4; +4: x = 99; // breakpt +5: @} +(gdb) info locals +x = 4 +x = 3 +@end smallexample + +A variable is shadowed when there's another variable by 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}. + @item info locals [-q] [-t @var{type_regexp}] [@var{regexp}] Like @kbd{info locals}, but only print the local variables selected with the provided regexp(s). diff --git a/gdb/printcmd.c b/gdb/printcmd.c index f1aaa644042..d2c5c4f5998 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -58,6 +58,7 @@ #include "gdbsupport/gdb-safe-ctype.h" #include "gdbsupport/rsp-low.h" #include "inferior.h" +#include "include/libiberty.h" /* Chain containing all defined memory-tag subcommands. */ @@ -2333,7 +2334,8 @@ clear_dangling_display_expressions (struct objfile *objfile) void print_variable_and_value (const char *name, struct symbol *var, const frame_info_ptr &frame, - struct ui_file *stream, int indent) + struct ui_file *stream, int indent, + bool shadowed, bool printed) { if (!name) @@ -2346,6 +2348,7 @@ print_variable_and_value (const char *name, struct symbol *var, { struct value *val; struct value_print_options opts; + const char *file_name = lbasename (var->owner.symtab->filename); /* READ_VAR_VALUE needs a block in order to deal with non-local references (i.e. to handle nested functions). In this context, we @@ -2355,6 +2358,14 @@ print_variable_and_value (const char *name, struct symbol *var, get_user_print_options (&opts); opts.deref_ref = true; common_val_print_checked (val, stream, indent, &opts, current_language); + + if (shadowed) + { + /* Print location and shadowed variable information. */ + fprintf_styled (stream, metadata_style.style (), + _("\t<%s:%d%s>"), file_name, + var->line (), printed ? ", shadowed" : ""); + } } catch (const gdb_exception_error &except) { diff --git a/gdb/stack.c b/gdb/stack.c index 4a3e7e4ff00..fcb0b7331de 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -58,6 +58,7 @@ #include "cli/cli-option.h" #include "cli/cli-style.h" #include "gdbsupport/buildargv.h" +#include /* The possible choices of "set print frame-arguments", and the value of this setting. */ @@ -2214,10 +2215,16 @@ backtrace_command_completer (struct cmd_list_element *ignore, static void iterate_over_block_locals (const struct block *b, - iterate_over_block_arg_local_vars_cb cb) + iterate_over_block_arg_local_vars_cb cb, + const std::unordered_set *shadowed_vars, + std::unordered_set &printed_vars) { for (struct symbol *sym : block_iterator_range (b)) { + const char *name = sym->print_name (); + bool already_printed = !printed_vars.insert (name).second; + bool shadowed = shadowed_vars->find (name) != shadowed_vars->end (); + switch (sym->aclass ()) { case LOC_CONST: @@ -2230,7 +2237,25 @@ iterate_over_block_locals (const struct block *b, break; if (sym->domain () == COMMON_BLOCK_DOMAIN) break; - cb (sym->print_name (), sym); + /* Only for C/C++/Fortran/Ada languages, in case of variables + shadowing print annotation after + the superblock variable. Iteration of block starts from inner + block which is printed only with location information. */ + if ((current_language->la_language == language_c + || current_language->la_language == language_cplus + || current_language->la_language == language_fortran + || current_language->la_language == language_ada) + && shadowed) + cb (name, sym, true, already_printed); + /* In case of Rust language it is possible to declare variable with + same name multiple times and only innermost instance of variable + is accessible. So print only the innermost instance and there is + no need of printing duplicates. */ + else if (current_language->la_language == language_rust + && shadowed && already_printed) + break; + else + cb (name, sym, false, false); break; default: @@ -2247,9 +2272,31 @@ void iterate_over_block_local_vars (const struct block *block, iterate_over_block_arg_local_vars_cb cb) { + std::unordered_set collected_vars, shadowed_vars, printed_vars; + const struct block *orig_block = block; + + /* Iterate over all the local variables in a block and store the list of + shadowed variables to later distinguish them from other variables. */ + while (block != nullptr) + { + for (struct symbol *sym : block_iterator_range (block)) + { + if (!sym->is_argument ()) + { + const char *name = sym->print_name (); + if (!collected_vars.insert (name).second) + shadowed_vars.insert (name); + } + } + if (block->function ()) + break; + block = block->superblock (); + } + + block = orig_block; while (block) { - iterate_over_block_locals (block, cb); + iterate_over_block_locals (block, cb, &shadowed_vars, printed_vars); /* After handling the function's top-level block, stop. Don't continue to its superblock, the block of per-file symbols. */ @@ -2271,14 +2318,16 @@ struct print_variable_and_value_data struct ui_file *stream; int values_printed; - void operator() (const char *print_name, struct symbol *sym); + void operator() (const char *print_name, struct symbol *sym, bool shadowed, + bool printed); }; /* The callback for the locals and args iterators. */ void print_variable_and_value_data::operator() (const char *print_name, - struct symbol *sym) + struct symbol *sym, + bool shadowed, bool printed) { frame_info_ptr frame; @@ -2298,7 +2347,8 @@ print_variable_and_value_data::operator() (const char *print_name, return; } - print_variable_and_value (print_name, sym, frame, stream, num_tabs); + print_variable_and_value (print_name, sym, frame, stream, num_tabs, shadowed, + printed); values_printed = 1; } @@ -2476,7 +2526,7 @@ iterate_over_block_arg_vars (const struct block *b, struct symbol *sym2 = lookup_symbol_search_name (sym->search_name (), b, SEARCH_VAR_DOMAIN).symbol; - cb (sym->print_name (), sym2); + cb (sym->print_name (), sym2, false, false); } } } diff --git a/gdb/stack.h b/gdb/stack.h index e7242c71036..37aa6844cf3 100644 --- a/gdb/stack.h +++ b/gdb/stack.h @@ -24,7 +24,8 @@ gdb::unique_xmalloc_ptr find_frame_funname (const frame_info_ptr &frame, enum language *funlang, struct symbol **funcp); -typedef gdb::function_view +typedef gdb::function_view iterate_over_block_arg_local_vars_cb; void iterate_over_block_arg_vars (const struct block *block, diff --git a/gdb/testsuite/gdb.ada/var_shadowing.exp b/gdb/testsuite/gdb.ada/var_shadowing.exp new file mode 100644 index 00000000000..9d446790254 --- /dev/null +++ b/gdb/testsuite/gdb.ada/var_shadowing.exp @@ -0,0 +1,39 @@ +# Copyright 2023-2024 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 "ada.exp" + +require allow_ada_tests + +standard_ada_testfile var_shadowing + +if {[gdb_compile_ada "${srcfile}" "${binfile}" \ + executable [list debug]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set i_level1 [gdb_get_line_number "I-Level1"] +set i_level2 [gdb_get_line_number "I-Level2"] +set i_level3 [gdb_get_line_number "I-Level3"] +set bp_location [gdb_get_line_number "BREAK"] +runto "var_shadowing.adb:$bp_location" + +gdb_test "info locals" [multi_line \ + "i = 111\t<$testfile.adb:$i_level3>" \ + "i = 11\t<$testfile.adb:$i_level2, shadowed>" \ + "i = 1\t<$testfile.adb:$i_level1, shadowed>" \ +] "info locals at innermost level" diff --git a/gdb/testsuite/gdb.ada/var_shadowing/var_shadowing.adb b/gdb/testsuite/gdb.ada/var_shadowing/var_shadowing.adb new file mode 100644 index 00000000000..55be43b77e2 --- /dev/null +++ b/gdb/testsuite/gdb.ada/var_shadowing/var_shadowing.adb @@ -0,0 +1,30 @@ +-- Copyright 2023-2024 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 . + +with Ada.Text_IO; use Ada.Text_IO; + +procedure Varshadow is + I : Integer := 1; -- I-Level1 +begin + declare + I : Integer := 11; -- I-Level2 + begin + declare + I : Integer := 111; -- I-Level3 + begin + Put_Line ("hello"); -- BREAK + end; + end; +end; diff --git a/gdb/testsuite/gdb.base/var-shadowing.c b/gdb/testsuite/gdb.base/var-shadowing.c new file mode 100755 index 00000000000..a0763419b38 --- /dev/null +++ b/gdb/testsuite/gdb.base/var-shadowing.c @@ -0,0 +1,49 @@ +/* Copyright (C) 2023-2024 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; /* bp for entry */ + 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 */ + { + #include "var-shadowing2.c" + 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.base/var-shadowing.exp b/gdb/testsuite/gdb.base/var-shadowing.exp new file mode 100755 index 00000000000..68372091330 --- /dev/null +++ b/gdb/testsuite/gdb.base/var-shadowing.exp @@ -0,0 +1,92 @@ +# Copyright 2023-2024 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 . + +standard_testfile +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { + return -1 +} + +if ![runto_main] { + return -1 +} + +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 "bp for entry"] + +gdb_breakpoint $srcfile:$bp_line1 +gdb_continue_to_breakpoint "continue to outermost level" \ + ".*$srcfile:$bp_line1.*" +gdb_test "info locals" [multi_line \ + "val1 = 1" \ + "val2 = 2" \ + ] "info locals at outermost level" + +gdb_breakpoint $srcfile:$bp_line2 +gdb_continue_to_breakpoint "continue to first level" ".*$srcfile:$bp_line2.*" +gdb_test "info locals" [multi_line \ + "val2 = 3\t<$srcfile:$val2_d2>" \ + "val3 = 4" \ + "a = 101" \ + "val1 = 1" \ + "val2 = 2\t<$srcfile:$val2_d1, shadowed>" \ + ] "info locals first level" + +gdb_breakpoint $srcfile:$bp_line3 +gdb_continue_to_breakpoint "continue to second level" ".*$srcfile:$bp_line3.*" +gdb_test "info locals" [multi_line \ + "val1 = 5\t<$srcfile:$val1_d2>" \ + "val2 = 3\t<$srcfile:$val2_d2>" \ + "val3 = 4" \ + "a = 102" \ + "val1 = 1\t<$srcfile:$val1_d1, shadowed>" \ + "val2 = 2\t<$srcfile:$val2_d1, shadowed>" \ + ] "info locals second level" + +gdb_breakpoint $srcfile:$bp_line4 +gdb_continue_to_breakpoint "continue to innermost level" ".*$srcfile:$bp_line4.*" +gdb_test "info locals" [multi_line \ + "a = 999\t<${testfile}2.c:16>" \ + "val1 = 6\t<$srcfile:$val1_d3>" \ + "val2 = 7\t<$srcfile:$val2_d3>" \ + "val3 = 8\t<$srcfile:$val3_d2>" \ + "val1 = 5\t<$srcfile:$val1_d2, shadowed>" \ + "val2 = 3\t<$srcfile:$val2_d2, shadowed>" \ + "val3 = 4\t<$srcfile:$val3_d1, shadowed>" \ + "a = 103\t<$srcfile:$a_line, shadowed>" \ + "val1 = 1\t<$srcfile:$val1_d1, shadowed>" \ + "val2 = 2\t<$srcfile:$val2_d1, shadowed>" \ + ] "info locals at innermost level" + +gdb_breakpoint $srcfile:$bp_line5 +gdb_continue_to_breakpoint "continue to outermost level last" \ + ".*$srcfile:$bp_line5.*" +gdb_test "info locals" [multi_line \ + "a = 105" \ + "val1 = 1" \ + "val2 = 2" \ + ] "info locals at outermost level last" diff --git a/gdb/testsuite/gdb.base/var-shadowing2.c b/gdb/testsuite/gdb.base/var-shadowing2.c new file mode 100644 index 00000000000..8223e11ec17 --- /dev/null +++ b/gdb/testsuite/gdb.base/var-shadowing2.c @@ -0,0 +1,16 @@ +/* Copyright (C) 2023-2024 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 . */ + +int a = 999; diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp index 358a8d29d89..e12f79fa94e 100644 --- a/gdb/testsuite/gdb.opt/inline-locals.exp +++ b/gdb/testsuite/gdb.opt/inline-locals.exp @@ -42,9 +42,11 @@ if { ! $no_frames } { "backtrace from bar 2" gdb_test "up" "#1 .*func1 .* at .*" "up from bar 2" gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 2" - set pass_re "array = \\{0 \\}" + set shadowed_pass_re "\t<$srcfile:$decimal>" + set shadowed_fail_re "\t<$srcfile:$decimal, shadowed>" + set pass_re "array = \\{0 \\}($shadowed_pass_re)?" set kfail_re [multi_line $pass_re \ - "array = "] + "array = $shadowed_fail_re"] gdb_test_multiple "info locals" "info locals above bar 2" { -re -wrap $pass_re { pass $gdb_test_name @@ -91,9 +93,9 @@ if { ! $no_frames } { "backtrace from bar 3" gdb_test "up" "#1 .*func1 .* at .*" "up from bar 3" gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 3" - set pass_re "array = {$decimal, \[^\r\n\]*}" + set pass_re "array = {$decimal, \[^\r\n\]*}($shadowed_pass_re)?" set kfail_re [multi_line $pass_re \ - "array = "] + "array = $shadowed_fail_re"] gdb_test_multiple "info locals" "info locals above bar 3" { -re -wrap $pass_re { pass $gdb_test_name @@ -133,7 +135,8 @@ proc check_scoped_locals {bp_label pass_re} { gdb_breakpoint $srcfile:$locals_bp gdb_continue_to_breakpoint "$bp_label" ".*$srcfile:$locals_bp.*" - set kfail_re [multi_line $pass_re ".*"] + set kfail_re [multi_line $pass_re \ + ".*(.*<$srcfile:$::decimal, shadowed>)?"] gdb_test_multiple "info locals" "scoped info locals at $bp_label" { -re -wrap $pass_re { pass $gdb_test_name @@ -149,7 +152,9 @@ proc check_scoped_locals {bp_label pass_re} { } if {! $no_frames } { - check_scoped_locals "bp for locals 1" "loc2 = 20\r\nloc1 = 10" - check_scoped_locals "bp for locals 2" "loc3 = 30\r\nloc2 = 20\r\nloc1 = 10" - check_scoped_locals "bp for locals 3" "loc1 = 10" + check_scoped_locals "bp for locals 1" \ + "loc2 = 20(\t<$srcfile:$decimal>)?\r\nloc1 = 10(\t<$srcfile:$decimal>)?" + check_scoped_locals "bp for locals 2" \ + "loc3 = 30(\t<$srcfile:$decimal>)?\r\nloc2 = 20(\t<$srcfile:$decimal>)?\r\nloc1 = 10(\t<$srcfile:$decimal>)?" + check_scoped_locals "bp for locals 3" "loc1 = 10(\t<$srcfile:$decimal>)?" } diff --git a/gdb/testsuite/gdb.rust/var_reuse.exp b/gdb/testsuite/gdb.rust/var_reuse.exp new file mode 100755 index 00000000000..1ed96830556 --- /dev/null +++ b/gdb/testsuite/gdb.rust/var_reuse.exp @@ -0,0 +1,34 @@ +# Copyright 2023-2024 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 rust-support.exp +require allow_rust_tests +require {can_compile rust} + +standard_testfile .rs +if {[prepare_for_testing "failed to prepare" \ + $testfile $srcfile {debug rust}]} { + return -1 +} + +set line [gdb_get_line_number "set breakpoint here"] +if {![runto ${srcfile}:$line]} { + untested "could not run to breakpoint" + return -1 +} + +# Wrong local values are shown for rustc version >= 1.73. +setup_xfail "*-*-*" "gdb/31079" +gdb_test "info local _x" "_x = 12" "print local _x variable" diff --git a/gdb/testsuite/gdb.rust/var_reuse.rs b/gdb/testsuite/gdb.rust/var_reuse.rs new file mode 100755 index 00000000000..09f2fcd008c --- /dev/null +++ b/gdb/testsuite/gdb.rust/var_reuse.rs @@ -0,0 +1,20 @@ +// Copyright (C) 2023-2024 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 . + +fn main() { + let _x = 5; + let _x = _x + 7; + let _y = 8; // set breakpoint here +} diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index d11c3f8a6be..cfce3002dd9 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1046,7 +1046,8 @@ collection_list::add_local_symbols (struct gdbarch *gdbarch, CORE_ADDR pc, int count = 0; auto do_collect_symbol = [&] (const char *print_name, - struct symbol *sym) + struct symbol *sym, + bool shadowed, bool printed) { collect_symbol (sym, gdbarch, frame_regno, frame_offset, pc, trace_string); diff --git a/gdb/value.h b/gdb/value.h index 13cfb007aa2..069bcffa5cc 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -1559,7 +1559,9 @@ extern void print_variable_and_value (const char *name, struct symbol *var, const frame_info_ptr &frame, struct ui_file *stream, - int indent); + int indent, + bool shadowed, + bool printed); extern void typedef_print (struct type *type, struct symbol *news, struct ui_file *stream);