diff mbox series

[03/30] Easy conversions to use block_symbol::address

Message ID 20231029-split-objfile-2023-bound-sym-october-v1-3-612531df2734@tromey.com
State New
Headers
Series Baby step for objfile splitting |

Commit Message

Tom Tromey Oct. 29, 2023, 11:23 p.m. UTC 
  This changes a few obvious spots to use block_symbol::address.
---
 gdb/ada-lang.c                      | 3 +--
 gdb/compile/compile-c-symbols.c     | 4 ++--
 gdb/compile/compile-cplus-symbols.c | 4 ++--
 gdb/compile/compile-cplus-types.c   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 9bb649e901d..3391aaeccb3 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5101,8 +5101,7 @@  remove_extra_symbols (std::vector<struct block_symbol> &syms)
 			     syms[j].symbol->linkage_name ()) == 0
 		  && (syms[i].symbol->aclass ()
 		      == syms[j].symbol->aclass ())
-		  && syms[i].symbol->value_address ()
-		  == syms[j].symbol->value_address ())
+		  && syms[i].address () == syms[j].address ())
 		remove_p = true;
 	    }
 	}
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 5982178170c..2d49ead249e 100644
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -88,7 +88,7 @@  convert_one_symbol (compile_c_instance *context,
 
 	case LOC_LABEL:
 	  kind = GCC_C_SYMBOL_LABEL;
-	  addr = sym.symbol->value_address ();
+	  addr = sym.address ();
 	  break;
 
 	case LOC_BLOCK:
@@ -179,7 +179,7 @@  convert_one_symbol (compile_c_instance *context,
 
 	case LOC_STATIC:
 	  kind = GCC_C_SYMBOL_VARIABLE;
-	  addr = sym.symbol->value_address ();
+	  addr = sym.address ();
 	  break;
 
 	case LOC_FINAL_VALUE:
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index 1edbf8f64b5..dec0260bf7a 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -82,7 +82,7 @@  convert_one_symbol (compile_cplus_instance *instance,
 
 	case LOC_LABEL:
 	  kind = GCC_CP_SYMBOL_LABEL;
-	  addr = sym.symbol->value_address ();
+	  addr = sym.address ();
 	  break;
 
 	case LOC_BLOCK:
@@ -175,7 +175,7 @@  convert_one_symbol (compile_cplus_instance *instance,
 
 	case LOC_STATIC:
 	  kind = GCC_CP_SYMBOL_VARIABLE;
-	  addr = sym.symbol->value_address ();
+	  addr = sym.address ();
 	  break;
 
 	case LOC_FINAL_VALUE:
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index ac27e83618b..53a98b432f4 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -627,7 +627,7 @@  compile_cplus_convert_struct_or_union_members
 		const char *filename = sym.symbol->symtab ()->filename;
 		unsigned int line = sym.symbol->line ();
 
-		physaddr = sym.symbol->value_address ();
+		physaddr = sym.address ();
 		instance->plugin ().build_decl
 		  ("field physname", field_name,
 		   (GCC_CP_SYMBOL_VARIABLE| get_field_access_flag (type, i)),