From: Aleksandar Ristovski <aristovski@qnx.com>
Date: Tue, 25 Oct 2011 18:32:25 +0000 (+0000)
Subject: Commit patch from HEAD: http://sourceware.org/ml/gdb-patches/2011-10/msg00577.html
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=095ebc0f293ed19a1041a9b8c65df599c219f0fb;p=thirdparty%2Fbinutils-gdb.git

Commit patch from HEAD: http://sourceware.org/ml/gdb-patches/2011-10/msg00577.html

	* cp-namespace.c (cp_scan_for_anonymous_namespaces): Changed function
	arguments by adding OBJFILE.  Instead of getting objfile from
	symbol's symtab, use new argument OBJFILE.
	* cp-support.h (cp_scan_for_anonymous_namespaces): Changed function
	arguments by adding OBJFILE.
	* gdb/dwarf2read.c (new_symbol_full): Change call to
	cp_scan_for_anonymous_namespaces to match new signature.
	* gdb/stabsread.c (define_symbol): Change call to
	cp_scan_for_anonymous_namespaces to match new signature.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 52d3c19e07a..c204b941eb9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-20  Aleksandar Ristovski  <aristovski@qnx.com>
+
+	* cp-namespace.c (cp_scan_for_anonymous_namespaces): Changed function
+	arguments by adding OBJFILE.  Instead of getting objfile from
+	symbol's symtab, use new argument OBJFILE.
+	* cp-support.h (cp_scan_for_anonymous_namespaces): Changed function
+	arguments by adding OBJFILE.
+	* gdb/dwarf2read.c (new_symbol_full): Change call to
+	cp_scan_for_anonymous_namespaces to match new signature.
+	* gdb/stabsread.c (define_symbol): Change call to
+	cp_scan_for_anonymous_namespaces to match new signature.
+
 2011-09-04  Joel Brobecker  <brobecker@adacore.com>
 
 	* version.in: Set version to 7.3.1.20110904-cvs.
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index cc761c8cd1a..df44419bccf 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -71,7 +71,8 @@ static void maintenance_cplus_namespace (char *args, int from_tty);
    anonymous namespace; if so, add an appropriate using directive.  */
 
 void
-cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
+cp_scan_for_anonymous_namespaces (const struct symbol *const symbol,
+				  struct objfile *const objfile)
 {
   if (SYMBOL_DEMANGLED_NAME (symbol) != NULL)
     {
@@ -114,7 +115,7 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
 		 namespace given by the previous component if there is
 		 one, or to the global namespace if there isn't.  */
 	      cp_add_using_directive (dest, src, NULL, NULL,
-	                              &SYMBOL_SYMTAB (symbol)->objfile->objfile_obstack);
+	                              &objfile->objfile_obstack);
 	    }
 	  /* The "+ 2" is for the "::".  */
 	  previous_component = next_component + 2;
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index bb0ba398f09..173a25b7d33 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -153,7 +153,8 @@ extern void cp_set_block_scope (const struct symbol *symbol,
 				const char *processing_current_prefix,
 				int processing_has_namespace_info);
 
-extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol);
+extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol,
+					      struct objfile *objfile);
 
 extern struct symbol *cp_lookup_symbol_nonlocal (const char *name,
 						 const struct block *block,
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 5bc9d0edc92..ad8fecb7f64 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -11445,7 +11445,7 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
 	 namespaces based on the demangled name.  */
       if (!processing_has_namespace_info
 	  && cu->language == language_cplus)
-	cp_scan_for_anonymous_namespaces (sym);
+	cp_scan_for_anonymous_namespaces (sym, objfile);
     }
   return (sym);
 }
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index c7d8a6c4743..63ef49c3284 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -729,7 +729,7 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
 	SYMBOL_SET_NAMES (sym, string, p - string, 1, objfile);
 
       if (SYMBOL_LANGUAGE (sym) == language_cplus)
-	cp_scan_for_anonymous_namespaces (sym);
+	cp_scan_for_anonymous_namespaces (sym, objfile);
 
     }
   p++;