Move the string pools down into the units. No functional change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171905 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h
index cc6c0f7..1e471f7 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -211,16 +211,16 @@
SmallVector<CompileUnit *, 1> CUs;
// Collection of strings for this unit and assorted symbols.
- StrPool *StringPool;
+ StrPool StringPool;
unsigned NextStringPoolNumber;
std::string StringPref;
public:
DwarfUnits(AsmPrinter *AP, FoldingSet<DIEAbbrev> *AS,
- std::vector<DIEAbbrev *> *A,
- StrPool *SP, const char *Pref) :
+ std::vector<DIEAbbrev *> *A, const char *Pref,
+ BumpPtrAllocator &DA) :
Asm(AP), AbbreviationsSet(AS), Abbreviations(A),
- StringPool(SP), NextStringPoolNumber(0), StringPref(Pref) {}
+ StringPool(DA), NextStringPoolNumber(0), StringPref(Pref) {}
/// \brief Compute the size and offset of a DIE given an incoming Offset.
unsigned computeSizeAndOffset(DIE *Die, unsigned Offset);
@@ -254,7 +254,7 @@
unsigned getStringPoolIndex(StringRef Str);
/// \brief Returns the string pool.
- StrPool *getStringPool() { return StringPool; }
+ StrPool *getStringPool() { return &StringPool; }
};
/// \brief Collects and handles dwarf debug information.
@@ -290,10 +290,6 @@
// separated by a zero byte, mapped to a unique id.
StringMap<unsigned, BumpPtrAllocator&> SourceIdMap;
- // A String->Symbol mapping of strings used by indirect
- // references.
- StrPool InfoStringPool;
-
// Provides a unique id per text section.
SetVector<const MCSection*> SectionMap;
@@ -409,9 +405,6 @@
// A list of all the unique abbreviations in use.
std::vector<DIEAbbrev *> SkeletonAbbrevs;
- // List of strings used in the skeleton.
- StrPool SkeletonStringPool;
-
// Holder for the skeleton information.
DwarfUnits SkeletonHolder;