darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gold/

Browse source 
* dwp.cc (Dwp_output_file::add_cu_set): Check for duplicate CUs.
	(Dwp_output_file::Dwp_index::enter_set): Add assert.
This commit is contained in:
Cary Coutant 2012-12-15 00:57:30 +00:00
parent fcb94e69be
commit 2a77e2ab18
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gold/ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-14 Cary Coutant <ccoutant@google.com>
* dwp.cc (Dwp_output_file::add_cu_set): Check for duplicate CUs.
(Dwp_output_file::Dwp_index::enter_set): Add assert.
2012-12-12 Alan Modra <amodra@gmail.com>
* powerpc.cc (class Track_tls): New.

6
gold/dwp.cc
View file

@ -1532,8 +1532,11 @@ Dwp_output_file::add_cu_set(uint64_t dwo_id,
debug_loc, debug_str_offsets, debug_macinfo,
debug_macro };
unsigned int slot;
this->cu_index_.find_or_add(dwo_id, &slot);
if (!this->cu_index_.find_or_add(dwo_id, &slot))
this->cu_index_.enter_set(slot, cu_set);
else
gold_warning(_("%s: duplicate entry for CU (dwo_id 0x%llx)"),
this->name_, (unsigned long long)dwo_id);
}
// Lookup a type signature and return TRUE if we have already seen it.
@ -1617,6 +1620,7 @@ Dwp_output_file::Dwp_index::enter_set(unsigned int slot,
this->shndx_pool_.push_back(0);
// Enter the signature and pool index into the hash table.
gold_assert(this->hash_table_[slot] == 0);
this->hash_table_[slot] = set.signature;
this->index_table_[slot] = pool_index;
++this->used_;