From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WQPSMf+PKWmjDj4AWB0awg (envelope-from ) for ; Fri, 28 Nov 2025 07:05:19 -0500 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=gnmHgxLS; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id C6A911E0B6; Fri, 28 Nov 2025 07:05:19 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 2DE461E08D for ; Fri, 28 Nov 2025 07:05:17 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9379E3858C30 for ; Fri, 28 Nov 2025 12:05:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9379E3858C30 Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=gnmHgxLS Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by sourceware.org (Postfix) with ESMTPS id 475513858D2A for ; Fri, 28 Nov 2025 12:03:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 475513858D2A 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 475513858D2A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764331435; cv=none; b=oPXUoMj67oSEuzhPF/zzacAf2zUvK0hWnw4JVo7Q7AsbUNuFn7L0mT5wLNIQ8KT2O0j7PFn6qmK7SQfSLdj4spqrL7aTfgQoAyGXiDCkeGp9LI2g1fSXv6gqRnpAZjwVw/NFLoI7tT/7U54ZPAN101M5t7BHewS92uzh46/8wLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764331435; c=relaxed/simple; bh=V6ReqeoR/ELxuLYH/uoFzznu59F2rLZhVo/lIdUTcW4=; h=DKIM-Signature:MIME-Version:From:To:Subject:Date:Message-ID: MIME-Version; b=aNC9e0r9Y0CS3juz47KJ2Q4yH4Q+rVO3sdIAVFqlkNc+aASaLQ+MmQ1NonJAwVy/3ejOwS5jPlCJrXXPE3iXi1PNAawUnxEyOQ4kQ2yGcpMkgrJdSSzqLub2QsfuV3bS2tZiKYOEhQsjt2347Iy0qYIVVOJ7R/JrD37VWv3FyWw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 475513858D2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764331435; x=1795867435; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=V6ReqeoR/ELxuLYH/uoFzznu59F2rLZhVo/lIdUTcW4=; b=gnmHgxLSBNHVh1dnyFN+1kmDYuksPxAV+zY4Wla/ndqN/r1ulznfKpnz s4MOmj1MVsNorHv5LQADA3fYuVa15Q+CSsT73qZmcFfBuK9+Dmtb8xEZ3 Och6rZhb2gDQFXtJ1n7fro8GDAc6r/eZPRBaUxirrUr6EQc1Y4oiRWWii JbUD/8Rsem1iDZEJWp7IP9uCJ0m/4hGiXotpohqIRYWQBOPhsikZuP++b ycoZO5Vq3E7V9saWlrXc8zcXlsrPP2PW6YtUIDC5OnWmbrpw5emvFOONX 2vQ8TLpxbF/UulF6pG3Uztdt9EZZOzv/sdw5nQ50o/qAQblj47Ca2oyr5 Q==; X-CSE-ConnectionGUID: 8cBygdxLQYmdbDvPt3IxMg== X-CSE-MsgGUID: gJOSR+GlQiKxaXagDWrTBw== X-IronPort-AV: E=McAfee;i="6800,10657,11626"; a="53930707" X-IronPort-AV: E=Sophos;i="6.20,232,1758610800"; d="scan'208";a="53930707" Content-Type: multipart/mixed; boundary="===============6199394024307766609==" MIME-Version: 1.0 Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2025 04:03:54 -0800 X-CSE-ConnectionGUID: VRFyWPxYTWGB2ERllTWifQ== X-CSE-MsgGUID: AavA3IMhRyKd+9862teoyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,232,1758610800"; d="scan'208";a="193885823" Received: from abijaz-mobl2.ger.corp.intel.com (HELO localhost) ([10.245.82.59]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2025 04:03:51 -0800 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 v11 1/2] gdb: add annotation in 'info locals' command for variables shadowing case Date: Fri, 28 Nov 2025 13:03:16 +0100 Message-ID: <20251128120317.12208-2-abdul.b.ijaz@intel.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251128120317.12208-1-abdul.b.ijaz@intel.com> References: <20251128120317.12208-1-abdul.b.ijaz@intel.com> MIME-Version: 1.0 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 --===============6199394024307766609== Content-Transfer-Encoding: 8bit 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 the gdb.opt/inline-locals.exp test according to this change. The test update is only required due to the existing gdb known ticket gdb/25695 where this issue is seen with 7.5.0 version on sles15sp6 but it is not seen anymore on the newer gcc versions e.g. gcc-11.4.0. Co-Authored-By: Andrew Burgess --- gdb/NEWS | 4 + gdb/doc/gdb.texinfo | 20 +++ gdb/language.c | 20 +++ gdb/language.h | 19 +++ gdb/printcmd.c | 29 ++++- gdb/stack.c | 115 ++++++++++++++++-- gdb/stack.h | 14 +++ 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 | 36 ++++++ gdb/testsuite/gdb.rust/var_reuse.rs | 20 +++ gdb/value.h | 17 ++- 16 files changed, 524 insertions(+), 17 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/NEWS b/gdb/NEWS index c976727ee45..616899147c3 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -74,6 +74,10 @@ New command class for help commands that we, as developers, believe would be close to a minimal set of commands for a new user of GDB. +info locals + GDB now shows the "shadowed" annotation and the location information in + the output of this command for variables shadowing case. + * Changed remote packets single-inf-arg in qSupported diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 1cc7d295fbf..9ea4a2705bf 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -9121,6 +9121,26 @@ 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: int y = 52; +5: x = 99; // breakpoint-line +6: @} +(gdb) info locals +x = 4 +y = 52 +x = 3 +@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}. The location can +help to locate the instances of shadowed variables. So, +location information is only added for shadowed variables. + @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/language.c b/gdb/language.c index 168b9381bee..b2e2d54b421 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -1092,6 +1092,26 @@ language_lookup_primitive_type_as_symbol (const struct language_defn *la, return sym; } +/* See language.h. */ + +lang_vars_shadowing get_lang_vars_shadowing_option (enum language lang) +{ + switch (lang) + { + case language_c: + case language_cplus: + case language_fortran: + case language_ada: + return lang_vars_shadowing::PRINT; + + case language_rust: + return lang_vars_shadowing::HIDE; + + default: + return lang_vars_shadowing::NONE; + } +} + /* Initialize the language routines. */ INIT_GDB_FILE (language) diff --git a/gdb/language.h b/gdb/language.h index 926d94405ea..ff49d82ce01 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -83,6 +83,21 @@ enum macro_expansion macro_expansion_no, macro_expansion_c }; +/* In the case of variable shadowing if extra information should be + printed for the current language is compared against it. */ + +enum class lang_vars_shadowing + { + /* Adds shadowed information for such variables. */ + PRINT, + + /* Does not print shadowed variables. */ + HIDE, + + /* Print variables without shadow information. */ + NONE, + }; + /* Per architecture (OS/ABI) language information. */ @@ -825,6 +840,10 @@ void c_get_string (struct value *value, symbol_name_matcher_ftype *get_symbol_name_matcher (const language_defn *lang, const lookup_name_info &lookup_name); +/* Returns the shadowing option supported for the input language. */ + +extern lang_vars_shadowing get_lang_vars_shadowing_option (enum language lang); + /* Save the current language and restore it upon destruction. */ class scoped_restore_current_language diff --git a/gdb/printcmd.c b/gdb/printcmd.c index b9618f0a333..b05b42d395a 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -2334,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, + var_shadowing shadow_status) { if (!name) @@ -2347,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->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 @@ -2356,6 +2358,31 @@ 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); + + /* Print <%line, shadowed> after the variable value only when it is variable + shadowing case. */ + if (shadow_status != var_shadowing::NONE) + { + bool printed = (shadow_status == var_shadowing::SHADOWED); + string_file out (current_uiout->can_emit_style_escape ()); + + gdb_printf (&out, "\t<%ps:", + styled_string (file_name_style.style (), file_name)); + + if (var->line () > 0) + gdb_printf (&out, "%ps", + styled_string (line_number_style.style (), + pulongest (var->line ()))); + else + gdb_puts ("No line number information available", &out); + + gdb_printf (&out, "%ps", + styled_string (metadata_style.style (), + printed ? ", shadowed" : "")); + gdb_puts (">", &out); + + gdb_puts (out.c_str ()); + } } catch (const gdb_exception_error &except) { diff --git a/gdb/stack.c b/gdb/stack.c index c2c76be8163..01314ca0754 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 "gdbsupport/unordered_set.h" /* The possible choices of "set print frame-arguments", and the value of this setting. */ @@ -2211,8 +2212,9 @@ backtrace_command_completer (struct cmd_list_element *ignore, /* Iterate over the local variables of a block B, calling CB. */ static void -iterate_over_block_locals (const struct block *b, - iterate_over_block_arg_local_vars_cb cb) +iterate_over_block_locals + (const struct block *b, + gdb::function_view cb) { for (struct symbol *sym : block_iterator_range (b)) { @@ -2258,6 +2260,71 @@ iterate_over_block_local_vars (const struct block *block, } } +/* Iterate over all the local variables in block B, including all its + superblocks, stopping when the top-level block is reached. */ + +void +iterate_over_block_local_vars_printing + (const struct block *block, + iterate_over_block_arg_local_vars_cb_printing cb) +{ + gdb::unordered_set collected_vars, shadowed_vars, printed_vars; + + /* Phase one: iterate over all locals within the block, and every parent + block up to the enclosing function block. Record all of the locals + seen, this allows us to know which locals are shadowing locals from a + more outer scope. */ + iterate_over_block_local_vars + (block, [&] (const char *print_name, struct symbol *sym) + { + if (!sym->is_argument ()) + { + if (!collected_vars.insert (print_name).second) + shadowed_vars.insert (print_name); + } + }); + + /* Phase two: iterate over all locals within the block, and every parent + block up to the enclosing function block. Print all the locals seen + by calling CB. Depending on the current language we vary the + arguments to CB to indicate shadowing. Or in some cases, we don't + print the local at all. */ + iterate_over_block_local_vars + (block, [&] (const char *print_name, struct symbol *sym) + { + bool already_printed = !printed_vars.insert (print_name).second; + bool shadowed = shadowed_vars.find (print_name) != shadowed_vars.end (); + + enum var_shadowing shadowing_status; + if (already_printed && shadowed) + shadowing_status = var_shadowing::SHADOWED; + else if (!already_printed && shadowed) + shadowing_status = var_shadowing::SHADOWING; + else + shadowing_status = var_shadowing::NONE; + + /* 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 (get_lang_vars_shadowing_option (current_language->la_language) + == lang_vars_shadowing::PRINT && shadowing_status != var_shadowing::NONE) + cb (print_name, sym, shadowing_status); + /* 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 (get_lang_vars_shadowing_option (current_language->la_language) + == lang_vars_shadowing::HIDE + && shadowing_status == var_shadowing::SHADOWED) + { + /* Nothing. */ + } + else + cb (print_name, sym, var_shadowing::NONE); + }); +} + /* Data to be passed around in the calls to the locals and args iterators. */ @@ -2270,14 +2337,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, + var_shadowing shadow_status); }; /* 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, + var_shadowing shadow_status) { frame_info_ptr frame; @@ -2297,7 +2366,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, + shadow_status); values_printed = 1; } @@ -2366,7 +2436,7 @@ print_frame_local_vars (const frame_info_ptr &frame, scoped_restore_selected_frame restore_selected_frame; select_frame (frame); - iterate_over_block_local_vars (block, cb_data); + iterate_over_block_local_vars_printing (block, cb_data); if (!cb_data.values_printed && !quiet) { @@ -2480,6 +2550,37 @@ iterate_over_block_arg_vars (const struct block *b, } } +/* Iterate over all the argument variables in block B. */ + +void +iterate_over_block_arg_vars_printing + (const struct block *b, + iterate_over_block_arg_local_vars_cb_printing cb) +{ + for (struct symbol *sym : block_iterator_range (b)) + { + /* Don't worry about things which aren't arguments. */ + if (sym->is_argument ()) + { + /* We have to look up the symbol because arguments can have + two entries (one a parameter, one a local) and the one we + want is the local, which lookup_symbol will find for us. + This includes gcc1 (not gcc2) on the sparc when passing a + small structure and gcc2 when the argument type is float + and it is passed as a double and converted to float by + the prologue (in the latter case the type of the LOC_ARG + symbol is double and the type of the LOC_LOCAL symbol is + float). There are also LOC_ARG/LOC_REGISTER pairs which + are not combined in symbol-reading. */ + + struct symbol *sym2 + = lookup_symbol_search_name (sym->search_name (), + b, SEARCH_VAR_DOMAIN).symbol; + cb (sym->print_name (), sym2, var_shadowing::NONE); + } + } +} + /* Print all argument variables of the function of FRAME. Print them with values to STREAM. If REGEXP is not NULL, only print argument variables whose name @@ -2524,7 +2625,7 @@ print_frame_arg_vars (const frame_info_ptr &frame, cb_data.stream = stream; cb_data.values_printed = 0; - iterate_over_block_arg_vars (func->value_block (), cb_data); + iterate_over_block_arg_vars_printing (func->value_block (), cb_data); if (!cb_data.values_printed && !quiet) { diff --git a/gdb/stack.h b/gdb/stack.h index 6b2efb8fe60..5557a722213 100644 --- a/gdb/stack.h +++ b/gdb/stack.h @@ -20,6 +20,8 @@ #ifndef GDB_STACK_H #define GDB_STACK_H +enum class var_shadowing; + gdb::unique_xmalloc_ptr find_frame_funname (const frame_info_ptr &frame, enum language *funlang, struct symbol **funcp); @@ -27,12 +29,24 @@ gdb::unique_xmalloc_ptr find_frame_funname (const frame_info_ptr &frame, typedef gdb::function_view iterate_over_block_arg_local_vars_cb; +typedef gdb::function_view + iterate_over_block_arg_local_vars_cb_printing; + void iterate_over_block_arg_vars (const struct block *block, iterate_over_block_arg_local_vars_cb cb); void iterate_over_block_local_vars (const struct block *block, iterate_over_block_arg_local_vars_cb cb); +void iterate_over_block_arg_vars_printing + (const struct block *block, + iterate_over_block_arg_local_vars_cb_printing cb); + +void iterate_over_block_local_vars_printing + (const struct block *block, + iterate_over_block_arg_local_vars_cb_printing cb); + /* Initialize *WHAT to be a copy of the user desired print what frame info. If !WHAT.has_value (), the printing function chooses a default set of information to print, otherwise the printing function should print diff --git a/gdb/testsuite/gdb.ada/var_shadowing.exp b/gdb/testsuite/gdb.ada/var_shadowing.exp new file mode 100644 index 00000000000..8f0619d3e7e --- /dev/null +++ b/gdb/testsuite/gdb.ada/var_shadowing.exp @@ -0,0 +1,39 @@ +# 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 "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..1c8f4e395a2 --- /dev/null +++ b/gdb/testsuite/gdb.ada/var_shadowing/var_shadowing.adb @@ -0,0 +1,30 @@ +-- 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 . + +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..454bbcb5235 --- /dev/null +++ b/gdb/testsuite/gdb.base/var-shadowing.c @@ -0,0 +1,49 @@ +/* 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; /* 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..53bf9474fbd --- /dev/null +++ b/gdb/testsuite/gdb.base/var-shadowing.exp @@ -0,0 +1,92 @@ +# 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 . + +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..b678f4d3916 --- /dev/null +++ b/gdb/testsuite/gdb.base/var-shadowing2.c @@ -0,0 +1,16 @@ +/* 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 . */ + +int a = 999; diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp index 6561cc39f3e..070b2953ce3 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..2a5fb43bbf7 --- /dev/null +++ b/gdb/testsuite/gdb.rust/var_reuse.exp @@ -0,0 +1,36 @@ +# 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 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. +if {[rust_at_least 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..361744b9503 --- /dev/null +++ b/gdb/testsuite/gdb.rust/var_reuse.rs @@ -0,0 +1,20 @@ +// 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 . + +fn main() { + let _x = 5; + let _x = _x + 7; + let _y = 8; // set breakpoint here +} diff --git a/gdb/value.h b/gdb/value.h index 67c12a9ac62..b506022977b 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -1568,11 +1568,26 @@ extern int val_print_string (struct type *elttype, const char *encoding, struct ui_file *stream, const struct value_print_options *options); +/* Track the shadowing status of a variable. */ +enum class var_shadowing +{ + /* This variable is not shadowed, and not shadowing. */ + NONE, + + /* This variable is shadowed by a later one.*/ + SHADOWED, + + /* This variable is shadowing an earlier one, and is not itself + shadowed. */ + SHADOWING +}; + 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, + enum var_shadowing shadow_status); extern void typedef_print (struct type *type, struct symbol *news, struct ui_file *stream); -- 2.51.1 --===============6199394024307766609== Content-Type: multipart/alternative; boundary="===============6065677297813118607==" MIME-Version: 1.0 Content-Disposition: inline --===============6065677297813118607== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Intel Deutschland GmbH Registered Address: Dornacher Stra=C3=9Fe 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 M=C3=BCnchen HRB 186928 --===============6065677297813118607== Content-Type: text/html; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable
Intel Deutschland GmbH
Registered Address: Dornacher Stra=C3= =9Fe 1, 85622 Feldkirchen, Germany
Tel: +49 89 991 430, www.intel.deManaging Directors: Harry Demas, Jeffrey Schneiderman, Yin Chong Sorrell<= div>Chairperson of the Supervisory Board: Nicole Lau
Registered Seat: M= unich
Commercial Register: Amtsgericht M=C3=BCnchen HRB 186928 --===============6065677297813118607==-- --===============6199394024307766609==--