[SCM] users/jkratoch/indexcxx: .

[jkratoch@sourceware.org]

The branch, users/jkratoch/indexcxx has been updated
       via  4951936409ad913e04f1a9f6a7cdbb21c1da926f (commit)
       via  12c6aeb662a13ad186f09dbc19802dd610df04a1 (commit)
       via  17e1104673523c5605ea4e3cc56eb5e8fecc059f (commit)
      from  87bc51b0838253b27e691f307a161517fdb35ba2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 4951936409ad913e04f1a9f6a7cdbb21c1da926f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Nov 29 22:45:32 2016 +0100

    .

commit 12c6aeb662a13ad186f09dbc19802dd610df04a1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Nov 29 09:44:33 2016 +0100

    .

commit 17e1104673523c5605ea4e3cc56eb5e8fecc059f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Nov 29 09:40:38 2016 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/dwarf2read.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

First 500 lines of diff:
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ed494ac..84f6234 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2019,7 +2019,7 @@ byte_swap (offset_type value)
 #define MAYBE_SWAP(V)  byte_swap (V)
 
 #else
-#define MAYBE_SWAP(V) (V)
+#define MAYBE_SWAP(V) static_cast<offset_type>(V)
 #endif /* WORDS_BIGENDIAN */
 
 /* Read the given attribute value as an address, taking the attribute's
@@ -22605,7 +22605,9 @@ public:
   template<typename T> void
   add_data (const T &data)
   {
-    std::copy (&data, &data + 1, add_size (sizeof (data)));
+    std::copy (reinterpret_cast<const gdb_byte *> (&data),
+	       reinterpret_cast<const gdb_byte *> (&data + 1),
+	       add_size (sizeof (data)));
   }
 
   void
@@ -22685,10 +22687,11 @@ hash_expand (struct mapped_symtab *symtab)
   symtab->data.resize (old_entries.size () * 2);
 
   for (auto &it:old_entries)
-    {
-      auto &ref (find_slot (symtab, it->name));
-      ref = std::move (it);
-    }
+    if (it)
+      {
+	auto &ref (find_slot (symtab, it->name));
+	ref = std::move (it);
+      }
 }
 
 // gcc/libstdc++-v3/include/bits/unique_ptr.h
@@ -22817,7 +22820,7 @@ write_hash_table (struct mapped_symtab *symtab, DataBuf &output, DataBuf &cpool)
   {
     /* Elements are sorted vectors of the indices of all the CUs that hold
        an object of this name.  */
-    std::unordered_set<std::vector<offset_type>> symbol_hash_table;
+    std::unordered_map<std::vector<offset_type>, offset_type> symbol_hash_table;
 
     /* We add all the index vectors to the constant pool first, to
        ensure alignment is ok.  */
@@ -22825,7 +22828,11 @@ write_hash_table (struct mapped_symtab *symtab, DataBuf &output, DataBuf &cpool)
       {
 	if (!it)
 	  continue;
-	if (!symbol_hash_table.insert (it->cu_indices).second)
+	gdb_assert (it->index_offset == 0);
+	const auto insertpair (symbol_hash_table.emplace (it->cu_indices,
+							  cpool.size ()));
+	it->index_offset = insertpair.first->second;
+	if (!insertpair.second)
 	  continue;
 	cpool.add_data (MAYBE_SWAP (it->cu_indices.size ()));
 	for (const auto iter:it->cu_indices)
@@ -23046,7 +23053,6 @@ write_one_signatured_type (void **slot, void *d)
     = (struct signatured_type_index_data *) d;
   struct signatured_type *entry = (struct signatured_type *) *slot;
   struct partial_symtab *psymtab = entry->per_cu.v.psymtab;
-  gdb_byte val[8];
 
   write_psymbols (info->symtab,
 		  info->psyms_seen,


hooks/post-receive
--
Repository for Project Archer.