Revert r201751 and solve the const problem a different way - by
making the cache mutable.
llvm-svn: 202417
diff --git a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
index cf8cbd5..4722d2b 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
@@ -426,15 +426,13 @@
/// ComputeSize - calculate the size of the location expression.
///
unsigned DIELoc::ComputeSize(AsmPrinter *AP) const {
- if (Size)
- return Size;
+ if (!Size) {
+ const SmallVectorImpl<DIEAbbrevData> &AbbrevData = Abbrev.getData();
+ for (unsigned i = 0, N = Values.size(); i < N; ++i)
+ Size += Values[i]->SizeOf(AP, AbbrevData[i].getForm());
+ }
- unsigned Sz = 0;
- const SmallVectorImpl<DIEAbbrevData> &AbbrevData = Abbrev.getData();
- for (unsigned i = 0, N = Values.size(); i < N; ++i)
- Sz += Values[i]->SizeOf(AP, AbbrevData[i].getForm());
-
- return Sz;
+ return Size;
}
/// EmitValue - Emit location data.
@@ -483,15 +481,13 @@
/// ComputeSize - calculate the size of the block.
///
unsigned DIEBlock::ComputeSize(AsmPrinter *AP) const {
- if (Size)
- return Size;
+ if (!Size) {
+ const SmallVectorImpl<DIEAbbrevData> &AbbrevData = Abbrev.getData();
+ for (unsigned i = 0, N = Values.size(); i < N; ++i)
+ Size += Values[i]->SizeOf(AP, AbbrevData[i].getForm());
+ }
- unsigned Sz = 0;
- const SmallVectorImpl<DIEAbbrevData> &AbbrevData = Abbrev.getData();
- for (unsigned i = 0, N = Values.size(); i < N; ++i)
- Sz += Values[i]->SizeOf(AP, AbbrevData[i].getForm());
-
- return Sz;
+ return Size;
}
/// EmitValue - Emit block data.
diff --git a/llvm/lib/CodeGen/AsmPrinter/DIE.h b/llvm/lib/CodeGen/AsmPrinter/DIE.h
index d4f3154..0a60859 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DIE.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DIE.h
@@ -445,7 +445,7 @@
/// DIELoc - Represents an expression location.
//
class DIELoc : public DIEValue, public DIE {
- unsigned Size; // Size in bytes excluding size header.
+ mutable unsigned Size; // Size in bytes excluding size header.
public:
DIELoc() : DIEValue(isLoc), DIE(0), Size(0) {}
@@ -453,10 +453,6 @@
///
unsigned ComputeSize(AsmPrinter *AP) const;
- /// setSize - Set the size of the location entry.
- ///
- void setSize(unsigned Sz) { Size = Sz; }
-
/// BestForm - Choose the best form for data.
///
dwarf::Form BestForm(unsigned DwarfVersion) const {
@@ -488,7 +484,7 @@
/// DIEBlock - Represents a block of values.
//
class DIEBlock : public DIEValue, public DIE {
- unsigned Size; // Size in bytes excluding size header.
+ mutable unsigned Size; // Size in bytes excluding size header.
public:
DIEBlock() : DIEValue(isBlock), DIE(0), Size(0) {}
@@ -496,10 +492,6 @@
///
unsigned ComputeSize(AsmPrinter *AP) const;
- /// setSize - Set the size of the block.
- ///
- void setSize(unsigned Sz) { Size = Sz; }
-
/// BestForm - Choose the best form for data.
///
dwarf::Form BestForm() const {
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index 2ac9f01..b42869b 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -348,14 +348,14 @@
/// addBlock - Add block data.
///
void DwarfUnit::addBlock(DIE *Die, dwarf::Attribute Attribute, DIELoc *Loc) {
- Loc->setSize(Loc->ComputeSize(Asm));
+ Loc->ComputeSize(Asm);
DIELocs.push_back(Loc); // Memoize so we can call the destructor later on.
Die->addValue(Attribute, Loc->BestForm(DD->getDwarfVersion()), Loc);
}
void DwarfUnit::addBlock(DIE *Die, dwarf::Attribute Attribute,
DIEBlock *Block) {
- Block->setSize(Block->ComputeSize(Asm));
+ Block->ComputeSize(Asm);
DIEBlocks.push_back(Block); // Memoize so we can call the destructor later on.
Die->addValue(Attribute, Block->BestForm(), Block);
}