From: Doug Evans <xdje42@gmail.com>
Date: Fri, 7 Nov 2014 06:50:12 +0000 (-0800)
Subject: New macro ALL_BLOCK_SYMBOLS_WITH_NAME.
X-Git-Tag: hjl/linux/release/2.25.51.0.1~3^2~44^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=358d6ab39c95691e721820fd54e9780208faf252;p=thirdparty%2Fbinutils-gdb.git

New macro ALL_BLOCK_SYMBOLS_WITH_NAME.

gdb/ChangeLog:

	* block.h (ALL_BLOCK_SYMBOLS_WITH_NAME): New macro.
	* block.c (block_lookup_symbol): Use it.
	* cp-support.c (make_symbol_overload_list_block): Use it.
	* symtab.c (iterate_over_symbols): Use it.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dc78a6a44ec..d6125d71c3d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-06  Doug Evans  <xdje42@gmail.com>
+
+	* block.h (ALL_BLOCK_SYMBOLS_WITH_NAME): New macro.
+	* block.c (block_lookup_symbol): Use it.
+	* cp-support.c (make_symbol_overload_list_block): Use it.
+	* symtab.c (iterate_over_symbols): Use it.
+
 2014-11-06  Doug Evans  <xdje42@gmail.com>
 
 	* symtab.c (lookup_block_symbol): Moved to ...
diff --git a/gdb/block.c b/gdb/block.c
index 3bb9de0cbaa..1cb98751f64 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -706,9 +706,7 @@ block_lookup_symbol (const struct block *block, const char *name,
 
   if (!BLOCK_FUNCTION (block))
     {
-      for (sym = block_iter_name_first (block, name, &iter);
-	   sym != NULL;
-	   sym = block_iter_name_next (name, &iter))
+      ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
 	{
 	  if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
 				     SYMBOL_DOMAIN (sym), domain))
@@ -726,9 +724,7 @@ block_lookup_symbol (const struct block *block, const char *name,
 
       struct symbol *sym_found = NULL;
 
-      for (sym = block_iter_name_first (block, name, &iter);
-	   sym != NULL;
-	   sym = block_iter_name_next (name, &iter))
+      ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
 	{
 	  if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
 				     SYMBOL_DOMAIN (sym), domain))
diff --git a/gdb/block.h b/gdb/block.h
index e8d34528ecd..50a79198969 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -286,4 +286,13 @@ extern struct symbol *block_lookup_symbol (const struct block *block,
        (sym);						\
        (sym) = block_iterator_next (&(iter)))
 
+/* Macro to loop through all symbols with name NAME in BLOCK,
+   in no particular order.  ITER helps keep track of the iteration, and
+   must be a struct block_iterator.  SYM points to the current symbol.  */
+
+#define ALL_BLOCK_SYMBOLS_WITH_NAME(block, name, iter, sym)		\
+  for ((sym) = block_iter_name_first ((block), (name), &(iter));	\
+       (sym) != NULL;							\
+       (sym) = block_iter_name_next ((name), &(iter)))
+
 #endif /* BLOCK_H */
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index d35920cf83c..72ffb521598 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1218,9 +1218,7 @@ make_symbol_overload_list_block (const char *name,
   struct block_iterator iter;
   struct symbol *sym;
 
-  for (sym = block_iter_name_first (block, name, &iter);
-       sym != NULL;
-       sym = block_iter_name_next (name, &iter))
+  ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
     overload_list_add_symbol (sym, name);
 }
 
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 482a23dde68..9add71fdc76 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2031,9 +2031,7 @@ iterate_over_symbols (const struct block *block, const char *name,
   struct block_iterator iter;
   struct symbol *sym;
 
-  for (sym = block_iter_name_first (block, name, &iter);
-       sym != NULL;
-       sym = block_iter_name_next (name, &iter))
+  ALL_BLOCK_SYMBOLS_WITH_NAME (block, name, iter, sym)
     {
       if (symbol_matches_domain (SYMBOL_LANGUAGE (sym),
 				 SYMBOL_DOMAIN (sym), domain))