Code cleanup: dwarf2read.c:uniquify_cu_indices: Use std::unique

gdb/ChangeLog:
2017-06-12  Pedro Alves  <palves@redhat.com>

	* dwarf2read.c (uniquify_cu_indices): Use std::unique and
	std::vector::erase.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 037fa0c579542caef12420de00ee32971500afe7..316e03af7c901076385eea288df9edfb479a5a8b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-12  Pedro Alves  <palves@redhat.com>
+
+       * dwarf2read.c (uniquify_cu_indices): Use std::unique and
+       std::vector::erase.
+
 2017-06-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Code cleanup: C++ify .gdb_index producer.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ef21092aabb10834882a743f1443ca256dc07995..0c9e275850fad139a89123b6e04d86dc6d72d4fb 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -23370,23 +23370,10 @@ uniquify_cu_indices (struct mapped_symtab *symtab)
     {
       if (entry && !entry->cu_indices.empty ())
        {
-         unsigned int next_to_insert, next_to_check;
-         offset_type last_value;
-
-         std::sort (entry->cu_indices.begin (), entry->cu_indices.end ());
-
-         last_value = entry->cu_indices[0];
-         next_to_insert = 1;
-         for (next_to_check = 1;
-              next_to_check < entry->cu_indices.size ();
-              ++next_to_check)
-           if (entry->cu_indices[next_to_check] != last_value)
-             {
-               last_value = entry->cu_indices[next_to_check];
-               entry->cu_indices[next_to_insert] = last_value;
-               ++next_to_insert;
-             }
-         entry->cu_indices.resize (next_to_insert);
+         auto &cu_indices = entry->cu_indices;
+         std::sort (cu_indices.begin (), cu_indices.end ());
+         auto from = std::unique (cu_indices.begin (), cu_indices.end ());
+         cu_indices.erase (from, cu_indices.end ());
        }
     }
 }