replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DebugInfo: Simplify the AddressPool representation 

llvm-svn: 185189
This commit is contained in:
David Blaikie 2013-06-28 18:47:19 +00:00
parent dea547b94d
commit b8ef7851dc
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -248,12 +248,10 @@ unsigned DwarfUnits::getStringPoolIndex(StringRef Str) {
}
unsigned DwarfUnits::getAddrPoolIndex(const MCSymbol *Sym) {
std::pair<const MCSymbol*, unsigned> &Entry = AddressPool[Sym];
if (Entry.first) return Entry.second;
Entry.second = NextAddrPoolNumber++;
Entry.first = Sym;
return Entry.second;
std::pair<DenseMap<const MCSymbol *, unsigned>::iterator, bool> P =
AddressPool.insert(std::make_pair(Sym, NextAddrPoolNumber));
NextAddrPoolNumber += P.second;
return P.first->second;
}
// Define a unique number for the abbreviation.
@ -2356,23 +2354,20 @@ void DwarfUnits::emitAddresses(const MCSection *AddrSection) {
// Start the dwarf addr section.
Asm->OutStreamer.SwitchSection(AddrSection);
// Get all of the string pool entries and put them in an array by their ID so
// Get all of the address pool entries and put them in an array by their ID so
// we can sort them.
SmallVector<std::pair<unsigned, std::pair<const MCSymbol *, unsigned> *>, 64>
Entries;
SmallVector<std::pair<unsigned, const MCSymbol *>, 64> Entries;
for (DenseMap<const MCSymbol *,
std::pair<const MCSymbol *, unsigned> >::iterator
I = AddressPool.begin(),
E = AddressPool.end();
for (DenseMap<const MCSymbol *, unsigned>::iterator I = AddressPool.begin(),
E = AddressPool.end();
I != E; ++I)
Entries.push_back(std::make_pair(I->second.second, &(I->second)));
Entries.push_back(std::make_pair(I->second, I->first));
array_pod_sort(Entries.begin(), Entries.end());
for (unsigned i = 0, e = Entries.size(); i != e; ++i) {
// Emit a label for reference from debug information entries.
if (const MCSymbol *Sym = Entries[i].second->first)
if (const MCSymbol *Sym = Entries[i].second)
Asm->EmitLabelReference(Sym, Asm->getDataLayout().getPointerSize());
else
Asm->OutStreamer.EmitIntValue(0, Asm->getDataLayout().getPointerSize());

5
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -195,10 +195,9 @@ public:
typedef StringMap<std::pair<MCSymbol*, unsigned>,
BumpPtrAllocator&> StrPool;
// A Symbol->pair<Symbol, unsigned> mapping of addresses used by indirect
// A Symbol->unsigned mapping of addresses used by indirect
// references.
typedef DenseMap<const MCSymbol *, std::pair<const MCSymbol *, unsigned> >
AddrPool;
typedef DenseMap<const MCSymbol *, unsigned> AddrPool;
/// \brief Collects and handles information specific to a particular
/// collection of units.