From: Simon Marchi <simon.marchi@efficios.com>
Date: Wed, 26 Mar 2025 19:55:37 +0000 (-0400)
Subject: gdb/dwarf: rename cache -> abbrev_cache
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fa17f72c93b4ee357df57ea651fd96d6c9ce901;p=thirdparty%2Fbinutils-gdb.git

gdb/dwarf: rename cache -> abbrev_cache

"cache" is just a bit too generic to be clear.

Change-Id: I8bf01c5fe84e076af1afd2453b1a115777630271
---

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 17f06ff1342..71fd352343a 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -2970,7 +2970,7 @@ cutu_reader::cutu_reader (dwarf2_per_cu &this_cu,
 			  dwarf2_cu *existing_cu,
 			  bool skip_partial,
 			  enum language pretend_language,
-			  const abbrev_table_cache *cache)
+			  const abbrev_table_cache *abbrev_cache)
 {
   struct objfile *objfile = per_objfile.objfile;
   struct dwarf2_section_info *section = this_cu.section;
@@ -3030,7 +3030,7 @@ cutu_reader::cutu_reader (dwarf2_per_cu &this_cu,
 	 indexer.  This assert is avoided in this case because (1) it
 	 is irrelevant, and (2) the get_cu method is not
 	 thread-safe.  */
-      gdb_assert (cache != nullptr
+      gdb_assert (abbrev_cache != nullptr
 		  || per_objfile.get_cu (&this_cu) == nullptr);
       m_new_cu = std::make_unique<dwarf2_cu> (&this_cu, &per_objfile);
       cu = m_new_cu.get ();
@@ -3092,9 +3092,9 @@ cutu_reader::cutu_reader (dwarf2_per_cu &this_cu,
 	gdb_assert (cu->header.abbrev_sect_off == abbrev_table->sect_off);
       else
 	{
-	  if (cache != nullptr)
-	    abbrev_table = cache->find (abbrev_section,
-					cu->header.abbrev_sect_off);
+	  if (abbrev_cache != nullptr)
+	    abbrev_table = abbrev_cache->find (abbrev_section,
+					       cu->header.abbrev_sect_off);
 	  if (abbrev_table == nullptr)
 	    {
 	      abbrev_section->read (objfile);
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 7f56dac32f1..b13e42d764f 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -927,7 +927,7 @@ public:
 	       dwarf2_cu *existing_cu,
 	       bool skip_partial,
 	       enum language pretend_language,
-	       const abbrev_table_cache *cache = nullptr);
+	       const abbrev_table_cache *abbrev_cache = nullptr);
 
   cutu_reader (dwarf2_per_cu &this_cu,
 	       dwarf2_per_objfile &per_objfile,