diff mbox series

[1/5] Rename members of index_cache_store_context

Message ID 20240128-pr-31262-index-cache-race-v1-1-4fe53c5265e3@tromey.com
State New
Headers
Series Fix race when writing to index cache |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed

Commit Message

Tom Tromey Jan. 28, 2024, 4:28 p.m. UTC 
  This renames the private members of index_cache_store_context to start
with "m_".
---
 gdb/dwarf2/index-cache.c | 10 +++++-----
 gdb/dwarf2/index-cache.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
index 7ddd7b3f974..645e36c66f7 100644
--- a/gdb/dwarf2/index-cache.c
+++ b/gdb/dwarf2/index-cache.c
@@ -104,7 +104,7 @@  index_cache_store_context::index_cache_store_context (const index_cache &ic,
       m_enabled = false;
       return;
     }
-  build_id_str = build_id_to_string (build_id);
+  m_build_id_str = build_id_to_string (build_id);
 
   /* Get build id of dwz file, if present.  */
   const dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
@@ -121,7 +121,7 @@  index_cache_store_context::index_cache_store_context (const index_cache &ic,
 	  return;
 	}
 
-      dwz_build_id_str = build_id_to_string (dwz_build_id);
+      m_dwz_build_id_str = build_id_to_string (dwz_build_id);
     }
 
   if (ic.m_dir.empty ())
@@ -159,8 +159,8 @@  index_cache::store (dwarf2_per_bfd *per_bfd,
   if (!ctx.m_enabled)
     return;
 
-  const char *dwz_build_id_ptr = (ctx.dwz_build_id_str.has_value ()
-				  ? ctx.dwz_build_id_str->c_str ()
+  const char *dwz_build_id_ptr = (ctx.m_dwz_build_id_str.has_value ()
+				  ? ctx.m_dwz_build_id_str->c_str ()
 				  : nullptr);
 
   try
@@ -171,7 +171,7 @@  index_cache::store (dwarf2_per_bfd *per_bfd,
       /* Write the index itself to the directory, using the build id as the
 	 filename.  */
       write_dwarf_index (per_bfd, m_dir.c_str (),
-			 ctx.build_id_str.c_str (), dwz_build_id_ptr,
+			 ctx.m_build_id_str.c_str (), dwz_build_id_ptr,
 			 dw_index_kind::GDB_INDEX);
     }
   catch (const gdb_exception_error &except)
diff --git a/gdb/dwarf2/index-cache.h b/gdb/dwarf2/index-cache.h
index db2ec82c958..079ed412d2e 100644
--- a/gdb/dwarf2/index-cache.h
+++ b/gdb/dwarf2/index-cache.h
@@ -49,10 +49,10 @@  struct index_cache_store_context
   bool m_enabled;
 
   /* Captured value of build id.  */
-  std::string build_id_str;
+  std::string m_build_id_str;
 
   /* Captured value of dwz build id.  */
-  std::optional<std::string> dwz_build_id_str;
+  std::optional<std::string> m_dwz_build_id_str;
 };
 
 /* Class to manage the access to the DWARF index cache.  */