From: Jim Blandy <jimb@codesourcery.com>
Date: Fri, 8 Nov 2002 19:33:37 +0000 (+0000)
Subject: * dwarf2read.c (read_func_scope): Restore local_symbols and
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=208d818701644f3d9582d264412485793e627492;p=binutils-gdb.git

* dwarf2read.c (read_func_scope): Restore local_symbols and
param_symbols after we finish the function context.  (Based on a
patch from David Edelsohn.)
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4470392898b..166ac5b9f02 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-08  Jim Blandy  <jimb@redhat.com>
+
+	* dwarf2read.c (read_func_scope): Restore local_symbols and
+	param_symbols after we finish the function context.  (Based on a
+	patch from David Edelsohn.)
+
 2002-11-08  David Carlton  <carlton@math.stanford.edu>
 
 	* linespec.c (symbol_found): New function.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 7ede81b71f1..7e017c6dfc0 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2013,6 +2013,14 @@ read_func_scope (struct die_info *die, struct objfile *objfile,
   /* Make a block for the local symbols within.  */
   finish_block (new->name, &local_symbols, new->old_blocks,
 		lowpc, highpc, objfile);
+  
+  /* In C++, we can have functions nested inside functions (e.g., when
+     a function declares a class that has methods).  This means that
+     when we finish processing a function scope, we may need to go
+     back to building a containing block's symbol lists.  */
+  local_symbols = new->locals;
+  param_symbols = new->params;
+
   list_in_scope = &file_symbols;
 }