From d3355e4dec4966ea32d47fc004e1bf8d9b3a3510 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 8 Jul 2020 10:55:56 +0100 Subject: [PATCH] gdb: Convert la_store_sym_names_in_linkage_form_p to a method Convert language_data::la_store_sym_names_in_linkage_form_p member variable to language_defn::store_sym_names_in_linkage_form_p virtual function. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-lang.c (ada_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. (ada_language::store_sym_names_in_linkage_form_p): New member function. * c-lang.c (c_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. (c_language::store_sym_names_in_linkage_form_p): New member function. (cplus_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. (asm_language_data): Likewise. (asm_language::store_sym_names_in_linkage_form_p): New member function. (minimal_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. (minimal_language::store_sym_names_in_linkage_form_p): New member function. * d-lang.c (d_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. * dwarf2/read.c (dwarf2_physname): Update call to store_sym_names_in_linkage_form_p. * f-lang.c (f_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. * go-lang.c (go_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. * language.c (unknown_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. (unknown_language::store_sym_names_in_linkage_form_p): New member function. (auto_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. (auto_language::store_sym_names_in_linkage_form_p): New member function. * language.h (language_data): Remove la_store_sym_names_in_linkage_form_p member variable. (language_defn::store_sym_names_in_linkage_form_p): New member function. * m2-lang.c (m2_language_data): Remove la_store_sym_names_in_linkage_form_p initializer. * objc-lang.c (objc_language_data): Likewise. * opencl-lang.c (opencl_language_data): Likewise. * p-lang.c (pascal_language_data): Likewise. * rust-lang.c (rust_language_data): Likewise. --- gdb/ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ gdb/ada-lang.c | 6 +++++- gdb/c-lang.c | 19 +++++++++++++++---- gdb/d-lang.c | 1 - gdb/dwarf2/read.c | 2 +- gdb/f-lang.c | 1 - gdb/go-lang.c | 1 - gdb/language.c | 7 +++++-- gdb/language.h | 43 +++++++++++++++++++++---------------------- gdb/m2-lang.c | 1 - gdb/objc-lang.c | 1 - gdb/opencl-lang.c | 1 - gdb/p-lang.c | 1 - gdb/rust-lang.c | 1 - 14 files changed, 93 insertions(+), 38 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a337c605fc0..ac4ec6fde7f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,49 @@ +2020-09-16 Andrew Burgess + + * ada-lang.c (ada_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + (ada_language::store_sym_names_in_linkage_form_p): New member + function. + * c-lang.c (c_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + (c_language::store_sym_names_in_linkage_form_p): New member + function. + (cplus_language_data): Remove la_store_sym_names_in_linkage_form_p + initializer. + (asm_language_data): Likewise. + (asm_language::store_sym_names_in_linkage_form_p): New member + function. + (minimal_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + (minimal_language::store_sym_names_in_linkage_form_p): New member + function. + * d-lang.c (d_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + * dwarf2/read.c (dwarf2_physname): Update call to + store_sym_names_in_linkage_form_p. + * f-lang.c (f_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + * go-lang.c (go_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + * language.c (unknown_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + (unknown_language::store_sym_names_in_linkage_form_p): New member + function. + (auto_language_data): Remove la_store_sym_names_in_linkage_form_p + initializer. + (auto_language::store_sym_names_in_linkage_form_p): New member + function. + * language.h (language_data): Remove + la_store_sym_names_in_linkage_form_p member variable. + (language_defn::store_sym_names_in_linkage_form_p): New member + function. + * m2-lang.c (m2_language_data): Remove + la_store_sym_names_in_linkage_form_p initializer. + * objc-lang.c (objc_language_data): Likewise. + * opencl-lang.c (opencl_language_data): Likewise. + * p-lang.c (pascal_language_data): Likewise. + * rust-lang.c (rust_language_data): Likewise. + 2020-09-16 Andrew Burgess * ada-lang.c (ada_language_data): Remove string_lower_bound diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index b90e7a05bcd..723e08e0db0 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13714,7 +13714,6 @@ extern const struct language_data ada_language_data = array_row_major, macro_expansion_no, &ada_exp_descriptor, - true, /* la_store_sym_names_in_linkage_form_p */ ada_op_print_tab, /* expression operators for printing */ &ada_varobj_ops, }; @@ -14203,6 +14202,11 @@ public: bool c_style_arrays_p () const override { return false; } + /* See language.h. */ + + bool store_sym_names_in_linkage_form_p () const override + { return true; } + protected: /* See language.h. */ diff --git a/gdb/c-lang.c b/gdb/c-lang.c index ecb339c3f87..c8fe630c247 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -880,7 +880,6 @@ extern const struct language_data c_language_data = array_row_major, macro_expansion_c, &exp_descriptor_c, - true, /* la_store_sym_names_in_linkage_form_p */ c_op_print_tab, /* expression operators for printing */ &c_varobj_ops, }; @@ -943,6 +942,11 @@ public: { c_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + bool store_sym_names_in_linkage_form_p () const override + { return true; } }; /* Single instance of the C language class. */ @@ -986,7 +990,6 @@ extern const struct language_data cplus_language_data = array_row_major, macro_expansion_c, &exp_descriptor_c, - false, /* la_store_sym_names_in_linkage_form_p */ c_op_print_tab, /* expression operators for printing */ &cplus_varobj_ops, }; @@ -1195,7 +1198,6 @@ extern const struct language_data asm_language_data = array_row_major, macro_expansion_c, &exp_descriptor_c, - true, /* la_store_sym_names_in_linkage_form_p */ c_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; @@ -1245,6 +1247,11 @@ public: { c_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + bool store_sym_names_in_linkage_form_p () const override + { return true; } }; /* The single instance of the ASM language class. */ @@ -1262,7 +1269,6 @@ extern const struct language_data minimal_language_data = array_row_major, macro_expansion_c, &exp_descriptor_c, - true, /* la_store_sym_names_in_linkage_form_p */ c_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; @@ -1301,6 +1307,11 @@ public: { c_print_type (type, varstring, stream, show, level, flags); } + + /* See language.h. */ + + bool store_sym_names_in_linkage_form_p () const override + { return true; } }; /* The single instance of the minimal language class. */ diff --git a/gdb/d-lang.c b/gdb/d-lang.c index f75a973fbfb..2c6da4723c5 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -133,7 +133,6 @@ extern const struct language_data d_language_data = array_row_major, macro_expansion_no, &exp_descriptor_c, - false, /* la_store_sym_names_in_linkage_form_p */ d_op_print_tab, /* Expression operators for printing. */ &default_varobj_ops, }; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 2c554d6d5c9..16001aa9e9b 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -10635,7 +10635,7 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu) if (mangled != NULL) { - if (language_def (cu->language)->la_store_sym_names_in_linkage_form_p) + if (language_def (cu->language)->store_sym_names_in_linkage_form_p ()) { /* Do nothing (do not demangle the symbol name). */ } diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 344bdb8f0c8..f4202c34964 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -491,7 +491,6 @@ extern const struct language_data f_language_data = array_column_major, macro_expansion_no, &exp_descriptor_f, - false, /* la_store_sym_names_in_linkage_form_p */ f_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; diff --git a/gdb/go-lang.c b/gdb/go-lang.c index c0ad0be1362..ed18f01dbdc 100644 --- a/gdb/go-lang.c +++ b/gdb/go-lang.c @@ -513,7 +513,6 @@ extern const struct language_data go_language_data = array_row_major, macro_expansion_no, &exp_descriptor_c, - false, /* la_store_sym_names_in_linkage_form_p */ go_op_print_tab, /* Expression operators for printing. */ &default_varobj_ops, }; diff --git a/gdb/language.c b/gdb/language.c index 1866a964599..3503408ad21 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -780,7 +780,6 @@ extern const struct language_data unknown_language_data = array_row_major, macro_expansion_no, &exp_descriptor_standard, - true, /* store_sym_names_in_linkage_form_p */ unk_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; @@ -898,6 +897,11 @@ public: const char *name_of_this () const override { return "this"; } + + /* See language.h. */ + + bool store_sym_names_in_linkage_form_p () const override + { return true; } }; /* Single instance of the unknown language class. */ @@ -913,7 +917,6 @@ extern const struct language_data auto_language_data = array_row_major, macro_expansion_no, &exp_descriptor_standard, - false, /* store_sym_names_in_linkage_form_p */ unk_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; diff --git a/gdb/language.h b/gdb/language.h index d83ea132a91..10a9e707320 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -206,28 +206,6 @@ struct language_data const struct exp_descriptor *la_exp_desc; - /* Now come some hooks for lookup_symbol. */ - - /* True if the symbols names should be stored in GDB's data structures - for minimal/partial/full symbols using their linkage (aka mangled) - form; false if the symbol names should be demangled first. - - Most languages implement symbol lookup by comparing the demangled - names, in which case it is advantageous to store that information - already demangled, and so would set this field to false. - - On the other hand, some languages have opted for doing symbol - lookups by comparing mangled names instead, for reasons usually - specific to the language. Those languages should set this field - to true. - - And finally, other languages such as C or Asm do not have - the concept of mangled vs demangled name, so those languages - should set this field to true as well, to prevent any accidental - demangling through an unrelated language's demangler. */ - - const bool la_store_sym_names_in_linkage_form_p; - /* Table for printing expressions. */ const struct op_print *la_op_print_tab; @@ -573,6 +551,27 @@ struct language_defn : language_data virtual char string_lower_bound () const { return c_style_arrays_p () ? 0 : 1; } + /* Returns true if the symbols names should be stored in GDB's data + structures for minimal/partial/full symbols using their linkage (aka + mangled) form; false if the symbol names should be demangled first. + + Most languages implement symbol lookup by comparing the demangled + names, in which case it is advantageous to store that information + already demangled, and so would return false, which is the default. + + On the other hand, some languages have opted for doing symbol lookups + by comparing mangled names instead, for reasons usually specific to + the language. Those languages should override this function and + return true. + + And finally, other languages such as C or Asm do not have the concept + of mangled vs demangled name, so those languages should also override + this function and return true, to prevent any accidental demangling + through an unrelated language's demangler. */ + + virtual bool store_sym_names_in_linkage_form_p () const + { return false; } + protected: /* This is the overridable part of the GET_SYMBOL_NAME_MATCHER method. diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 7bd9e710377..577d8192114 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -204,7 +204,6 @@ extern const struct language_data m2_language_data = array_row_major, macro_expansion_no, &exp_descriptor_modula2, - false, /* la_store_sym_names_in_linkage_form_p */ m2_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 337b7a49f3c..7b2dbd8bfa2 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -328,7 +328,6 @@ extern const struct language_data objc_language_data = array_row_major, macro_expansion_c, &exp_descriptor_standard, - false, /* la_store_sym_names_in_linkage_form_p */ objc_op_print_tab, /* Expression operators for printing */ &default_varobj_ops, }; diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c index 2e3e54a2233..f8105f21cae 100644 --- a/gdb/opencl-lang.c +++ b/gdb/opencl-lang.c @@ -1011,7 +1011,6 @@ extern const struct language_data opencl_language_data = array_row_major, macro_expansion_c, &exp_descriptor_opencl, - false, /* la_store_sym_names_in_linkage_form_p */ c_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; diff --git a/gdb/p-lang.c b/gdb/p-lang.c index b07557151db..9ca1427098e 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -257,7 +257,6 @@ extern const struct language_data pascal_language_data = array_row_major, macro_expansion_no, &exp_descriptor_standard, - false, /* la_store_sym_names_in_linkage_form_p */ pascal_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 12fc138785d..25bd965667e 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1906,7 +1906,6 @@ extern const struct language_data rust_language_data = array_row_major, macro_expansion_no, &exp_descriptor_rust, - false, /* la_store_sym_names_in_linkage_form_p */ c_op_print_tab, /* expression operators for printing */ &default_varobj_ops, }; -- 2.30.2