[PATCH 4/5] gdb/dwarf: rename some abbrev-related things in debug_names writer

[simon.marchi@polymtl.ca]

From: Simon Marchi <simon.marchi@polymtl.ca>

I think it would be clearer for some of these things to be called
"abbrev", rather than "idx".

Change-Id: Ic128a77dc7ce14a6179c049a2de21f3f9636405d
---
 gdb/dwarf2/index-write.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 39910cd3f71c..c4bd424d4340 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -720,17 +720,17 @@ class debug_names
 	    if (parent != nullptr && (parent->flags & IS_SYNTHESIZED) != 0)
 	      parent = nullptr;
 
-	    int &idx = m_indexkey_to_idx[index_key (entry->tag,
-						    kind,
-						    entry->flags,
-						    entry->lang,
-						    parent != nullptr)];
-	    if (idx == 0)
+	    int &abbrev = m_indexkey_to_abbrev[index_key (entry->tag,
+							  kind,
+							  entry->flags,
+							  entry->lang,
+							  parent != nullptr)];
+	    if (abbrev == 0)
 	      {
-		idx = next_abbrev++;
+		abbrev = next_abbrev++;
 
 		/* Abbrev number and tag.  */
-		m_abbrev_table.append_unsigned_leb128 (idx);
+		m_abbrev_table.append_unsigned_leb128 (abbrev);
 		m_abbrev_table.append_unsigned_leb128 (entry->tag);
 
 		/* Unit index.  */
@@ -790,7 +790,7 @@ class debug_names
 	    gdb_assert (offset_inserted);
 
 	    /* Write the entry to the pool, starting with the abbrev number.  */
-	    m_entry_pool.append_unsigned_leb128 (idx);
+	    m_entry_pool.append_unsigned_leb128 (abbrev);
 
 	    /* Unit index.  */
 	    const auto it = m_cu_index_htab.find (entry->per_cu);
@@ -1107,8 +1107,8 @@ class debug_names
   debug_str_lookup m_debugstrlookup;
 
   /* Map each used .debug_names abbreviation tag parameter to its
-     index value.  */
-  gdb::unordered_map<index_key, int, index_key_hasher> m_indexkey_to_idx;
+     abbrev value.  */
+  gdb::unordered_map<index_key, int, index_key_hasher> m_indexkey_to_abbrev;
 
   /* .debug_names abbreviation table.  */
   data_buf m_abbrev_table;
-- 
2.52.0