DwarfDebug: Store the filename/dirname pair as a zero-separated string in a stringmap, instead of using a highly inefficient std::map of a pair of std::strings.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152541 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer
2012-03-11 14:56:26 +00:00
parent c5eaae4e9b
commit 74612c250b
2 changed files with 13 additions and 15 deletions

View File

@@ -523,20 +523,19 @@ unsigned DwarfDebug::GetOrCreateSourceID(StringRef FileName,
DirName = "";
unsigned SrcId = SourceIdMap.size()+1;
std::pair<std::string, std::string> SourceName =
std::make_pair(FileName, DirName);
std::pair<std::pair<std::string, std::string>, unsigned> Entry =
make_pair(SourceName, SrcId);
std::map<std::pair<std::string, std::string>, unsigned>::iterator I;
bool NewlyInserted;
llvm::tie(I, NewlyInserted) = SourceIdMap.insert(Entry);
if (!NewlyInserted)
return I->second;
// We look up the file/dir pair by concatenating them with a zero byte.
SmallString<128> NamePair;
NamePair += DirName;
NamePair += '\0'; // Zero bytes are not allowed in paths.
NamePair += FileName;
StringMapEntry<unsigned> &Ent = SourceIdMap.GetOrCreateValue(NamePair, SrcId);
if (Ent.getValue() != SrcId)
return Ent.getValue();
// Print out a .file directive to specify files for .loc directives.
Asm->OutStreamer.EmitDwarfFileDirective(SrcId, Entry.first.second,
Entry.first.first);
Asm->OutStreamer.EmitDwarfFileDirective(SrcId, DirName, FileName);
return SrcId;
}

View File

@@ -26,7 +26,6 @@
#include "llvm/ADT/UniqueVector.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/DebugLoc.h"
#include <map>
namespace llvm {
@@ -209,9 +208,9 @@ class DwarfDebug {
///
std::vector<DIEAbbrev *> Abbreviations;
/// SourceIdMap - Source id map, i.e. pair of source filename and directory
/// mapped to a unique id.
std::map<std::pair<std::string, std::string>, unsigned> SourceIdMap;
/// SourceIdMap - Source id map, i.e. pair of source filename and directory,
/// separated by a zero byte, mapped to a unique id.
StringMap<unsigned> SourceIdMap;
/// StringPool - A String->Symbol mapping of strings used by indirect
/// references.