[llvm] r201196 - DwarfUnit: Provide a reference to a defining DwarfCompileUnit from DwarfTypeUnit.
David Blaikie
dblaikie at gmail.com
Tue Feb 11 16:31:30 PST 2014
Author: dblaikie
Date: Tue Feb 11 18:31:30 2014
New Revision: 201196
URL: http://llvm.org/viewvc/llvm-project?rev=201196&view=rev
Log:
DwarfUnit: Provide a reference to a defining DwarfCompileUnit from DwarfTypeUnit.
Type units need to insert their file strings into the compile unit's
line/file table. This is preliminary work to that end.
Modified:
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=201196&r1=201195&r2=201196&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Feb 11 18:31:30 2014
@@ -2965,11 +2965,11 @@ DwarfCompileUnit *DwarfDebug::constructS
// This DIE has the following attributes: DW_AT_comp_dir, DW_AT_dwo_name,
// DW_AT_addr_base.
-DwarfTypeUnit *DwarfDebug::constructSkeletonTU(const DwarfTypeUnit *TU) {
+DwarfTypeUnit *DwarfDebug::constructSkeletonTU(DwarfTypeUnit *TU) {
DIE *Die = new DIE(dwarf::DW_TAG_type_unit);
DwarfTypeUnit *NewTU = new DwarfTypeUnit(
- TU->getUniqueID(), Die, TU->getCUNode(), Asm, this, &SkeletonHolder);
+ TU->getUniqueID(), Die, TU->getCU(), Asm, this, &SkeletonHolder);
NewTU->setTypeSignature(TU->getTypeSignature());
NewTU->setType(NULL);
NewTU->initSection(
@@ -3007,29 +3007,29 @@ void DwarfDebug::emitDebugStrDWO() {
OffSec, StrSym);
}
-void DwarfDebug::addDwarfTypeUnitType(DICompileUnit CUNode,
+void DwarfDebug::addDwarfTypeUnitType(DwarfCompileUnit &CU,
StringRef Identifier, DIE *RefDie,
DICompositeType CTy) {
// Flag the type unit reference as a declaration so that if it contains
// members (implicit special members, static data member definitions, member
// declarations for definitions in this CU, etc) consumers don't get confused
// and think this is a full definition.
- CUMap.begin()->second->addFlag(RefDie, dwarf::DW_AT_declaration);
+ CU.addFlag(RefDie, dwarf::DW_AT_declaration);
const DwarfTypeUnit *&TU = DwarfTypeUnits[CTy];
if (TU) {
- CUMap.begin()->second->addDIETypeSignature(RefDie, *TU);
+ CU.addDIETypeSignature(RefDie, *TU);
return;
}
DIE *UnitDie = new DIE(dwarf::DW_TAG_type_unit);
DwarfTypeUnit *NewTU = new DwarfTypeUnit(
- InfoHolder.getUnits().size(), UnitDie, CUNode, Asm, this, &InfoHolder);
+ InfoHolder.getUnits().size(), UnitDie, CU, Asm, this, &InfoHolder);
TU = NewTU;
InfoHolder.addUnit(NewTU);
NewTU->addUInt(UnitDie, dwarf::DW_AT_language, dwarf::DW_FORM_data2,
- CUNode.getLanguage());
+ CU.getLanguage());
MD5 Hash;
Hash.update(Identifier);
@@ -3050,5 +3050,5 @@ void DwarfDebug::addDwarfTypeUnitType(DI
? Asm->getObjFileLowering().getDwarfTypesDWOSection(Signature)
: Asm->getObjFileLowering().getDwarfTypesSection(Signature));
- CUMap.begin()->second->addDIETypeSignature(RefDie, *NewTU);
+ CU.addDIETypeSignature(RefDie, *NewTU);
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=201196&r1=201195&r2=201196&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h Tue Feb 11 18:31:30 2014
@@ -606,7 +606,7 @@ class DwarfDebug : public AsmPrinterHand
/// \brief Construct the split debug info compile unit for the debug info
/// section.
- DwarfTypeUnit *constructSkeletonTU(const DwarfTypeUnit *TU);
+ DwarfTypeUnit *constructSkeletonTU(DwarfTypeUnit *TU);
/// \brief Emit the debug info dwo section.
void emitDebugInfoDWO();
@@ -710,7 +710,7 @@ public:
/// \brief Add a DIE to the set of types that we're going to pull into
/// type units.
- void addDwarfTypeUnitType(DICompileUnit CUNode, StringRef Identifier,
+ void addDwarfTypeUnitType(DwarfCompileUnit &CU, StringRef Identifier,
DIE *Die, DICompositeType CTy);
/// \brief Add a label so that arange data can be generated for it.
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=201196&r1=201195&r2=201196&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Tue Feb 11 18:31:30 2014
@@ -55,9 +55,11 @@ DwarfCompileUnit::DwarfCompileUnit(unsig
insertDIE(Node, D);
}
-DwarfTypeUnit::DwarfTypeUnit(unsigned UID, DIE *D, DICompileUnit CUNode,
+DwarfTypeUnit::DwarfTypeUnit(unsigned UID, DIE *D, DwarfCompileUnit &CU,
AsmPrinter *A, DwarfDebug *DW, DwarfFile *DWU)
- : DwarfUnit(UID, D, CUNode, A, DW, DWU) {}
+ : DwarfUnit(UID, D, CU.getCUNode(), A, DW, DWU), CU(CU) {
+ (void)CU;
+}
/// ~Unit - Destructor for compile unit.
DwarfUnit::~DwarfUnit() {
@@ -944,7 +946,7 @@ DIE *DwarfUnit::getOrCreateTypeDIE(const
DICompositeType CTy(Ty);
if (GenerateDwarfTypeUnits && !Ty.isForwardDecl())
if (MDString *TypeId = CTy.getIdentifier()) {
- DD->addDwarfTypeUnitType(getCUNode(), TypeId->getString(), TyDIE, CTy);
+ DD->addDwarfTypeUnitType(getCU(), TypeId->getString(), TyDIE, CTy);
// Skip updating the accellerator tables since this is not the full type
return TyDIE;
}
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h?rev=201196&r1=201195&r2=201196&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.h Tue Feb 11 18:31:30 2014
@@ -31,6 +31,7 @@ class MachineOperand;
class ConstantInt;
class ConstantFP;
class DbgVariable;
+class DwarfCompileUnit;
// Data structure to hold a range for range lists.
class RangeSpan {
@@ -462,6 +463,7 @@ public:
virtual void emitHeader(const MCSection *ASection,
const MCSymbol *ASectionSym) const;
+ virtual DwarfCompileUnit &getCU() = 0;
protected:
/// getOrCreateStaticMemberDIE - Create new static data member DIE.
DIE *getOrCreateStaticMemberDIE(DIDerivedType DT);
@@ -547,15 +549,20 @@ public:
/// addLabelAddress - Add a dwarf label attribute data and value using
/// either DW_FORM_addr or DW_FORM_GNU_addr_index.
void addLabelAddress(DIE *Die, dwarf::Attribute Attribute, MCSymbol *Label);
+
+ DwarfCompileUnit &getCU() LLVM_OVERRIDE {
+ return *this;
+ }
};
class DwarfTypeUnit : public DwarfUnit {
private:
uint64_t TypeSignature;
const DIE *Ty;
+ DwarfCompileUnit &CU;
public:
- DwarfTypeUnit(unsigned UID, DIE *D, DICompileUnit CUNode, AsmPrinter *A,
+ DwarfTypeUnit(unsigned UID, DIE *D, DwarfCompileUnit &CU, AsmPrinter *A,
DwarfDebug *DW, DwarfFile *DWU);
virtual ~DwarfTypeUnit() LLVM_OVERRIDE;
@@ -571,6 +578,9 @@ public:
sizeof(uint32_t); // Type DIE Offset
}
void initSection(const MCSection *Section);
+ DwarfCompileUnit &getCU() LLVM_OVERRIDE {
+ return CU;
+ }
};
} // end llvm namespace
#endif
More information about the llvm-commits
mailing list