From c5d0225d250b4c6537a0d22f0a89975834bfd294 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 7 Jun 2018 22:11:47 -0600 Subject: [PATCH] Remove a VEC from dwarf2read.c This removes a VEC from dwarf2read.c, replacing it with a std::vector. Tested by the buildbot. gdb/ChangeLog 2018-06-09 Tom Tromey * dwarf2read.c (process_cu_includes): Update. (process_full_comp_unit): Update. * dwarf2read.h (struct dwarf2_per_objfile) : Now a std::vector. --- gdb/ChangeLog | 7 +++++++ gdb/dwarf2read.c | 12 +++--------- gdb/dwarf2read.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 12157bb2721..c12ecc3facc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-06-09 Tom Tromey + + * dwarf2read.c (process_cu_includes): Update. + (process_full_comp_unit): Update. + * dwarf2read.h (struct dwarf2_per_objfile) : Now a + std::vector. + 2018-06-08 Paul Koning PR gdb/23252 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 1cabfbb0d45..7f1857930b1 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -10217,19 +10217,13 @@ compute_compunit_symtab_includes (struct dwarf2_per_cu_data *per_cu) static void process_cu_includes (struct dwarf2_per_objfile *dwarf2_per_objfile) { - int ix; - struct dwarf2_per_cu_data *iter; - - for (ix = 0; - VEC_iterate (dwarf2_per_cu_ptr, dwarf2_per_objfile->just_read_cus, - ix, iter); - ++ix) + for (struct dwarf2_per_cu_data *iter : dwarf2_per_objfile->just_read_cus) { if (! iter->is_debug_types) compute_compunit_symtab_includes (iter); } - VEC_free (dwarf2_per_cu_ptr, dwarf2_per_objfile->just_read_cus); + dwarf2_per_objfile->just_read_cus.clear (); } /* Generate full symbol information for PER_CU, whose DIEs have @@ -10337,7 +10331,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu, } /* Push it for inclusion processing later. */ - VEC_safe_push (dwarf2_per_cu_ptr, dwarf2_per_objfile->just_read_cus, per_cu); + dwarf2_per_objfile->just_read_cus.push_back (per_cu); } /* Generate full symbol information for type unit PER_CU, whose DIEs have diff --git a/gdb/dwarf2read.h b/gdb/dwarf2read.h index fbac7171deb..74335d77db0 100644 --- a/gdb/dwarf2read.h +++ b/gdb/dwarf2read.h @@ -233,7 +233,7 @@ public: htab_t die_type_hash {}; /* The CUs we recently read. */ - VEC (dwarf2_per_cu_ptr) *just_read_cus = NULL; + std::vector just_read_cus; /* Table containing line_header indexed by offset and offset_in_dwz. */ htab_t line_header_hash {};