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

Revert 90858 90875 and 90805 for now. 

llvm-svn: 90898
This commit is contained in:
Devang Patel 2009-12-08 23:21:45 +00:00
parent e07f152e6d
commit 512001ac7d
5 changed files with 174 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/include/llvm/Analysis/DebugInfo.h
View File

@ -99,7 +99,6 @@ namespace llvm {
bool isGlobalVariable() const; bool isGlobalVariable() const;
bool isScope() const; bool isScope() const;
bool isCompileUnit() const; bool isCompileUnit() const;
bool isNameSpace() const;
bool isLexicalBlock() const; bool isLexicalBlock() const;
bool isSubrange() const; bool isSubrange() const;
bool isEnumerator() const; bool isEnumerator() const;
@ -471,22 +470,6 @@ namespace llvm {
StringRef getFilename() const { return getContext().getFilename(); } StringRef getFilename() const { return getContext().getFilename(); }
}; };
/// DINameSpace - A wrapper for a C++ style name space.
class DINameSpace : public DIScope {
public:
explicit DINameSpace(MDNode *N = 0) : DIScope(N) {
if (DbgNode && !isNameSpace())
DbgNode = 0;
}
DIScope getContext() const { return getFieldAs<DIScope>(1); }
StringRef getName() const { return getStringField(2); }
StringRef getDirectory() const { return getContext().getDirectory(); }
StringRef getFilename() const { return getContext().getFilename(); }
DICompileUnit getCompileUnit() const { return getFieldAs<DICompileUnit>(3); }
unsigned getLineNumber() const { return getUnsignedField(4); }
};
/// DILocation - This object holds location information. This object /// DILocation - This object holds location information. This object
/// is not associated with any DWARF tag. /// is not associated with any DWARF tag.
class DILocation : public DIDescriptor { class DILocation : public DIDescriptor {
@ -641,11 +624,6 @@ namespace llvm {
/// with the specified parent context. /// with the specified parent context.
DILexicalBlock CreateLexicalBlock(DIDescriptor Context); DILexicalBlock CreateLexicalBlock(DIDescriptor Context);
/// CreateNameSpace - This creates new descriptor for a namespace
/// with the specified parent context.
DINameSpace CreateNameSpace(DIDescriptor Context, StringRef Name,
DICompileUnit CU, unsigned LineNo);
/// CreateLocation - Creates a debug info location. /// CreateLocation - Creates a debug info location.
DILocation CreateLocation(unsigned LineNo, unsigned ColumnNo, DILocation CreateLocation(unsigned LineNo, unsigned ColumnNo,
DIScope S, DILocation OrigLoc); DIScope S, DILocation OrigLoc);

28
llvm/lib/Analysis/DebugInfo.cpp
View File

@ -227,7 +227,6 @@ bool DIDescriptor::isScope() const {
case dwarf::DW_TAG_compile_unit: case dwarf::DW_TAG_compile_unit:
case dwarf::DW_TAG_lexical_block: case dwarf::DW_TAG_lexical_block:
case dwarf::DW_TAG_subprogram: case dwarf::DW_TAG_subprogram:
case dwarf::DW_TAG_namespace:
return true; return true;
default: default:
break; break;
@ -243,14 +242,6 @@ bool DIDescriptor::isCompileUnit() const {
return Tag == dwarf::DW_TAG_compile_unit; return Tag == dwarf::DW_TAG_compile_unit;
} }
/// isNameSpace - Return true if the specified tag is DW_TAG_namespace.
bool DIDescriptor::isNameSpace() const {
assert (!isNull() && "Invalid descriptor!");
unsigned Tag = getTag();
return Tag == dwarf::DW_TAG_namespace;
}
/// isLexicalBlock - Return true if the specified tag is DW_TAG_lexical_block. /// isLexicalBlock - Return true if the specified tag is DW_TAG_lexical_block.
bool DIDescriptor::isLexicalBlock() const { bool DIDescriptor::isLexicalBlock() const {
assert (!isNull() && "Invalid descriptor!"); assert (!isNull() && "Invalid descriptor!");
@ -447,8 +438,6 @@ StringRef DIScope::getFilename() const {
return DISubprogram(DbgNode).getFilename(); return DISubprogram(DbgNode).getFilename();
else if (isCompileUnit()) else if (isCompileUnit())
return DICompileUnit(DbgNode).getFilename(); return DICompileUnit(DbgNode).getFilename();
else if (isNameSpace())
return DINameSpace(DbgNode).getFilename();
else else
assert (0 && "Invalid DIScope!"); assert (0 && "Invalid DIScope!");
return StringRef(); return StringRef();
@ -461,8 +450,6 @@ StringRef DIScope::getDirectory() const {
return DISubprogram(DbgNode).getDirectory(); return DISubprogram(DbgNode).getDirectory();
else if (isCompileUnit()) else if (isCompileUnit())
return DICompileUnit(DbgNode).getDirectory(); return DICompileUnit(DbgNode).getDirectory();
else if (isNameSpace())
return DINameSpace(DbgNode).getDirectory();
else else
assert (0 && "Invalid DIScope!"); assert (0 && "Invalid DIScope!");
return StringRef(); return StringRef();
@ -1009,21 +996,6 @@ DILexicalBlock DIFactory::CreateLexicalBlock(DIDescriptor Context) {
return DILexicalBlock(MDNode::get(VMContext, &Elts[0], 2)); return DILexicalBlock(MDNode::get(VMContext, &Elts[0], 2));
} }
/// CreateNameSpace - This creates new descriptor for a namespace
/// with the specified parent context.
DINameSpace DIFactory::CreateNameSpace(DIDescriptor Context, StringRef Name,
DICompileUnit CompileUnit,
unsigned LineNo) {
Value *Elts[] = {
GetTagConstant(dwarf::DW_TAG_namespace),
Context.getNode(),
MDString::get(VMContext, Name),
CompileUnit.getNode(),
ConstantInt::get(Type::getInt32Ty(VMContext), LineNo)
};
return DINameSpace(MDNode::get(VMContext, &Elts[0], 5));
}
/// CreateLocation - Creates a debug info location. /// CreateLocation - Creates a debug info location.
DILocation DIFactory::CreateLocation(unsigned LineNo, unsigned ColumnNo, DILocation DIFactory::CreateLocation(unsigned LineNo, unsigned ColumnNo,
DIScope S, DILocation OrigLoc) { DIScope S, DILocation OrigLoc) {

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

@ -446,23 +446,6 @@ void DwarfDebug::addSourceLine(DIE *Die, const DIType *Ty) {
addUInt(Die, dwarf::DW_AT_decl_line, 0, Line); addUInt(Die, dwarf::DW_AT_decl_line, 0, Line);
} }
/// addSourceLine - Add location information to specified debug information
/// entry.
void DwarfDebug::addSourceLine(DIE *Die, const DINameSpace *NS) {
// If there is no compile unit specified, don't add a line #.
if (NS->getCompileUnit().isNull())
return;
unsigned Line = NS->getLineNumber();
StringRef FN = NS->getFilename();
StringRef Dir = NS->getDirectory();
unsigned FileID = GetOrCreateSourceID(Dir, FN);
assert(FileID && "Invalid file id");
addUInt(Die, dwarf::DW_AT_decl_file, 0, FileID);
addUInt(Die, dwarf::DW_AT_decl_line, 0, Line);
}
/* Byref variables, in Blocks, are declared by the programmer as /* Byref variables, in Blocks, are declared by the programmer as
"SomeType VarName;", but the compiler creates a "SomeType VarName;", but the compiler creates a
__Block_byref_x_VarName struct, and gives the variable VarName __Block_byref_x_VarName struct, and gives the variable VarName
@ -756,12 +739,12 @@ void DwarfDebug::addAddress(DIE *Die, unsigned Attribute,
} }
/// addType - Add a new type attribute to the specified entity. /// addType - Add a new type attribute to the specified entity.
void DwarfDebug::addType(DIE *Entity, DIType Ty) { void DwarfDebug::addType(CompileUnit *DW_Unit, DIE *Entity, DIType Ty) {
if (Ty.isNull()) if (Ty.isNull())
return; return;
// Check for pre-existence. // Check for pre-existence.
DIEEntry *Entry = ModuleCU->getDIEEntry(Ty.getNode()); DIEEntry *Entry = DW_Unit->getDIEEntry(Ty.getNode());
// If it exists then use the existing value. // If it exists then use the existing value.
if (Entry) { if (Entry) {
@ -771,40 +754,37 @@ void DwarfDebug::addType(DIE *Entity, DIType Ty) {
// Set up proxy. // Set up proxy.
Entry = createDIEEntry(); Entry = createDIEEntry();
ModuleCU->insertDIEEntry(Ty.getNode(), Entry); DW_Unit->insertDIEEntry(Ty.getNode(), Entry);
// Construct type. // Construct type.
DIE *Buffer = new DIE(dwarf::DW_TAG_base_type); DIE *Buffer = new DIE(dwarf::DW_TAG_base_type);
ModuleCU->insertDIE(Ty.getNode(), Buffer); ModuleCU->insertDIE(Ty.getNode(), Buffer);
if (Ty.isBasicType()) if (Ty.isBasicType())
constructTypeDIE(*Buffer, DIBasicType(Ty.getNode())); constructTypeDIE(DW_Unit, *Buffer, DIBasicType(Ty.getNode()));
else if (Ty.isCompositeType()) else if (Ty.isCompositeType())
constructTypeDIE(*Buffer, DICompositeType(Ty.getNode())); constructTypeDIE(DW_Unit, *Buffer, DICompositeType(Ty.getNode()));
else { else {
assert(Ty.isDerivedType() && "Unknown kind of DIType"); assert(Ty.isDerivedType() && "Unknown kind of DIType");
constructTypeDIE(*Buffer, DIDerivedType(Ty.getNode())); constructTypeDIE(DW_Unit, *Buffer, DIDerivedType(Ty.getNode()));
} }
// Add debug information entry to entity and appropriate context. // Add debug information entry to entity and appropriate context.
DIE *Die = NULL; DIE *Die = NULL;
DIDescriptor Context = Ty.getContext(); DIDescriptor Context = Ty.getContext();
if (!Context.isNull()) { if (!Context.isNull())
if (Context.isNameSpace()) { Die = DW_Unit->getDIE(Context.getNode());
DINameSpace NS(Context.getNode());
Die = getOrCreateNameSpace(NS);
} else
Die = ModuleCU->getDIE(Context.getNode());
}
if (Die) if (Die)
Die->addChild(Buffer); Die->addChild(Buffer);
else else
ModuleCU->addDie(Buffer); DW_Unit->addDie(Buffer);
Entry->setEntry(Buffer); Entry->setEntry(Buffer);
Entity->addValue(dwarf::DW_AT_type, dwarf::DW_FORM_ref4, Entry); Entity->addValue(dwarf::DW_AT_type, dwarf::DW_FORM_ref4, Entry);
} }
/// constructTypeDIE - Construct basic type die from DIBasicType. /// constructTypeDIE - Construct basic type die from DIBasicType.
void DwarfDebug::constructTypeDIE(DIE &Buffer, DIBasicType BTy) { void DwarfDebug::constructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DIBasicType BTy) {
// Get core information. // Get core information.
StringRef Name = BTy.getName(); StringRef Name = BTy.getName();
Buffer.setTag(dwarf::DW_TAG_base_type); Buffer.setTag(dwarf::DW_TAG_base_type);
@ -819,7 +799,8 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DIBasicType BTy) {
} }
/// constructTypeDIE - Construct derived type die from DIDerivedType. /// constructTypeDIE - Construct derived type die from DIDerivedType.
void DwarfDebug::constructTypeDIE(DIE &Buffer, DIDerivedType DTy) { void DwarfDebug::constructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DIDerivedType DTy) {
// Get core information. // Get core information.
StringRef Name = DTy.getName(); StringRef Name = DTy.getName();
uint64_t Size = DTy.getSizeInBits() >> 3; uint64_t Size = DTy.getSizeInBits() >> 3;
@ -832,7 +813,7 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DIDerivedType DTy) {
// Map to main type, void will not have a type. // Map to main type, void will not have a type.
DIType FromTy = DTy.getTypeDerivedFrom(); DIType FromTy = DTy.getTypeDerivedFrom();
addType(&Buffer, FromTy); addType(DW_Unit, &Buffer, FromTy);
// Add name if not anonymous or intermediate type. // Add name if not anonymous or intermediate type.
if (!Name.empty()) if (!Name.empty())
@ -848,7 +829,8 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DIDerivedType DTy) {
} }
/// constructTypeDIE - Construct type DIE from DICompositeType. /// constructTypeDIE - Construct type DIE from DICompositeType.
void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) { void DwarfDebug::constructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DICompositeType CTy) {
// Get core information. // Get core information.
StringRef Name = CTy.getName(); StringRef Name = CTy.getName();
@ -859,7 +841,7 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
switch (Tag) { switch (Tag) {
case dwarf::DW_TAG_vector_type: case dwarf::DW_TAG_vector_type:
case dwarf::DW_TAG_array_type: case dwarf::DW_TAG_array_type:
constructArrayTypeDIE(Buffer, &CTy); constructArrayTypeDIE(DW_Unit, Buffer, &CTy);
break; break;
case dwarf::DW_TAG_enumeration_type: { case dwarf::DW_TAG_enumeration_type: {
DIArray Elements = CTy.getTypeArray(); DIArray Elements = CTy.getTypeArray();
@ -869,7 +851,7 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
DIE *ElemDie = NULL; DIE *ElemDie = NULL;
DIEnumerator Enum(Elements.getElement(i).getNode()); DIEnumerator Enum(Elements.getElement(i).getNode());
if (!Enum.isNull()) { if (!Enum.isNull()) {
ElemDie = constructEnumTypeDIE(&Enum); ElemDie = constructEnumTypeDIE(DW_Unit, &Enum);
Buffer.addChild(ElemDie); Buffer.addChild(ElemDie);
} }
} }
@ -879,7 +861,7 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
// Add return type. // Add return type.
DIArray Elements = CTy.getTypeArray(); DIArray Elements = CTy.getTypeArray();
DIDescriptor RTy = Elements.getElement(0); DIDescriptor RTy = Elements.getElement(0);
addType(&Buffer, DIType(RTy.getNode())); addType(DW_Unit, &Buffer, DIType(RTy.getNode()));
// Add prototype flag. // Add prototype flag.
addUInt(&Buffer, dwarf::DW_AT_prototyped, dwarf::DW_FORM_flag, 1); addUInt(&Buffer, dwarf::DW_AT_prototyped, dwarf::DW_FORM_flag, 1);
@ -888,7 +870,7 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
for (unsigned i = 1, N = Elements.getNumElements(); i < N; ++i) { for (unsigned i = 1, N = Elements.getNumElements(); i < N; ++i) {
DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter); DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter);
DIDescriptor Ty = Elements.getElement(i); DIDescriptor Ty = Elements.getElement(i);
addType(Arg, DIType(Ty.getNode())); addType(DW_Unit, Arg, DIType(Ty.getNode()));
Buffer.addChild(Arg); Buffer.addChild(Arg);
} }
} }
@ -910,9 +892,11 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
continue; continue;
DIE *ElemDie = NULL; DIE *ElemDie = NULL;
if (Element.getTag() == dwarf::DW_TAG_subprogram) if (Element.getTag() == dwarf::DW_TAG_subprogram)
ElemDie = createMemberSubprogramDIE(DISubprogram(Element.getNode())); ElemDie = createMemberSubprogramDIE(DW_Unit,
DISubprogram(Element.getNode()));
else else
ElemDie = createMemberDIE(DIDerivedType(Element.getNode())); ElemDie = createMemberDIE(DW_Unit,
DIDerivedType(Element.getNode()));
Buffer.addChild(ElemDie); Buffer.addChild(ElemDie);
} }
@ -967,26 +951,26 @@ void DwarfDebug::constructSubrangeDIE(DIE &Buffer, DISubrange SR, DIE *IndexTy){
} }
/// constructArrayTypeDIE - Construct array type DIE from DICompositeType. /// constructArrayTypeDIE - Construct array type DIE from DICompositeType.
void DwarfDebug::constructArrayTypeDIE(DIE &Buffer, void DwarfDebug::constructArrayTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DICompositeType *CTy) { DICompositeType *CTy) {
Buffer.setTag(dwarf::DW_TAG_array_type); Buffer.setTag(dwarf::DW_TAG_array_type);
if (CTy->getTag() == dwarf::DW_TAG_vector_type) if (CTy->getTag() == dwarf::DW_TAG_vector_type)
addUInt(&Buffer, dwarf::DW_AT_GNU_vector, dwarf::DW_FORM_flag, 1); addUInt(&Buffer, dwarf::DW_AT_GNU_vector, dwarf::DW_FORM_flag, 1);
// Emit derived type. // Emit derived type.
addType(&Buffer, CTy->getTypeDerivedFrom()); addType(DW_Unit, &Buffer, CTy->getTypeDerivedFrom());
DIArray Elements = CTy->getTypeArray(); DIArray Elements = CTy->getTypeArray();
// Get an anonymous type for index type. // Get an anonymous type for index type.
DIE *IdxTy = ModuleCU->getIndexTyDie(); DIE *IdxTy = DW_Unit->getIndexTyDie();
if (!IdxTy) { if (!IdxTy) {
// Construct an anonymous type for index type. // Construct an anonymous type for index type.
IdxTy = new DIE(dwarf::DW_TAG_base_type); IdxTy = new DIE(dwarf::DW_TAG_base_type);
addUInt(IdxTy, dwarf::DW_AT_byte_size, 0, sizeof(int32_t)); addUInt(IdxTy, dwarf::DW_AT_byte_size, 0, sizeof(int32_t));
addUInt(IdxTy, dwarf::DW_AT_encoding, dwarf::DW_FORM_data1, addUInt(IdxTy, dwarf::DW_AT_encoding, dwarf::DW_FORM_data1,
dwarf::DW_ATE_signed); dwarf::DW_ATE_signed);
ModuleCU->addDie(IdxTy); DW_Unit->addDie(IdxTy);
ModuleCU->setIndexTyDie(IdxTy); DW_Unit->setIndexTyDie(IdxTy);
} }
// Add subranges to array type. // Add subranges to array type.
@ -998,7 +982,7 @@ void DwarfDebug::constructArrayTypeDIE(DIE &Buffer,
} }
/// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator. /// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator.
DIE *DwarfDebug::constructEnumTypeDIE(DIEnumerator *ETy) { DIE *DwarfDebug::constructEnumTypeDIE(CompileUnit *DW_Unit, DIEnumerator *ETy) {
DIE *Enumerator = new DIE(dwarf::DW_TAG_enumerator); DIE *Enumerator = new DIE(dwarf::DW_TAG_enumerator);
StringRef Name = ETy->getName(); StringRef Name = ETy->getName();
addString(Enumerator, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name); addString(Enumerator, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name);
@ -1008,7 +992,8 @@ DIE *DwarfDebug::constructEnumTypeDIE(DIEnumerator *ETy) {
} }
/// createGlobalVariableDIE - Create new DIE using GV. /// createGlobalVariableDIE - Create new DIE using GV.
DIE *DwarfDebug::createGlobalVariableDIE(const DIGlobalVariable &GV) { DIE *DwarfDebug::createGlobalVariableDIE(CompileUnit *DW_Unit,
const DIGlobalVariable &GV) {
// If the global variable was optmized out then no need to create debug info // If the global variable was optmized out then no need to create debug info
// entry. // entry.
if (!GV.getGlobal()) return NULL; if (!GV.getGlobal()) return NULL;
@ -1029,7 +1014,7 @@ DIE *DwarfDebug::createGlobalVariableDIE(const DIGlobalVariable &GV) {
addString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string, addString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
LinkageName); LinkageName);
} }
addType(GVDie, GV.getType()); addType(DW_Unit, GVDie, GV.getType());
if (!GV.isLocalToUnit()) if (!GV.isLocalToUnit())
addUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1); addUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1);
addSourceLine(GVDie, &GV); addSourceLine(GVDie, &GV);
@ -1045,13 +1030,13 @@ DIE *DwarfDebug::createGlobalVariableDIE(const DIGlobalVariable &GV) {
} }
/// createMemberDIE - Create new member DIE. /// createMemberDIE - Create new member DIE.
DIE *DwarfDebug::createMemberDIE(const DIDerivedType &DT) { DIE *DwarfDebug::createMemberDIE(CompileUnit *DW_Unit, const DIDerivedType &DT){
DIE *MemberDie = new DIE(DT.getTag()); DIE *MemberDie = new DIE(DT.getTag());
StringRef Name = DT.getName(); StringRef Name = DT.getName();
if (!Name.empty()) if (!Name.empty())
addString(MemberDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name); addString(MemberDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name);
addType(MemberDie, DT.getTypeDerivedFrom()); addType(DW_Unit, MemberDie, DT.getTypeDerivedFrom());
addSourceLine(MemberDie, &DT); addSourceLine(MemberDie, &DT);
@ -1105,7 +1090,8 @@ DIE *DwarfDebug::createMemberDIE(const DIDerivedType &DT) {
/// createRawSubprogramDIE - Create new partially incomplete DIE. This is /// createRawSubprogramDIE - Create new partially incomplete DIE. This is
/// a helper routine used by createMemberSubprogramDIE and /// a helper routine used by createMemberSubprogramDIE and
/// createSubprogramDIE. /// createSubprogramDIE.
DIE *DwarfDebug::createRawSubprogramDIE(const DISubprogram &SP) { DIE *DwarfDebug::createRawSubprogramDIE(CompileUnit *DW_Unit,
const DISubprogram &SP) {
DIE *SPDie = new DIE(dwarf::DW_TAG_subprogram); DIE *SPDie = new DIE(dwarf::DW_TAG_subprogram);
addString(SPDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, SP.getName()); addString(SPDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, SP.getName());
@ -1134,9 +1120,9 @@ DIE *DwarfDebug::createRawSubprogramDIE(const DISubprogram &SP) {
unsigned SPTag = SPTy.getTag(); unsigned SPTag = SPTy.getTag();
if (Args.isNull() || SPTag != dwarf::DW_TAG_subroutine_type) if (Args.isNull() || SPTag != dwarf::DW_TAG_subroutine_type)
addType(SPDie, SPTy); addType(DW_Unit, SPDie, SPTy);
else else
addType(SPDie, DIType(Args.getElement(0).getNode())); addType(DW_Unit, SPDie, DIType(Args.getElement(0).getNode()));
unsigned VK = SP.getVirtuality(); unsigned VK = SP.getVirtuality();
if (VK) { if (VK) {
@ -1153,10 +1139,11 @@ DIE *DwarfDebug::createRawSubprogramDIE(const DISubprogram &SP) {
/// createMemberSubprogramDIE - Create new member DIE using SP. This routine /// createMemberSubprogramDIE - Create new member DIE using SP. This routine
/// always returns a die with DW_AT_declaration attribute. /// always returns a die with DW_AT_declaration attribute.
DIE *DwarfDebug::createMemberSubprogramDIE(const DISubprogram &SP) { DIE *DwarfDebug::createMemberSubprogramDIE(CompileUnit *DW_Unit,
const DISubprogram &SP) {
DIE *SPDie = ModuleCU->getDIE(SP.getNode()); DIE *SPDie = ModuleCU->getDIE(SP.getNode());
if (!SPDie) if (!SPDie)
SPDie = createSubprogramDIE(SP); SPDie = createSubprogramDIE(DW_Unit, SP);
// If SPDie has DW_AT_declaration then reuse it. // If SPDie has DW_AT_declaration then reuse it.
if (!SP.isDefinition()) if (!SP.isDefinition())
@ -1167,7 +1154,7 @@ DIE *DwarfDebug::createMemberSubprogramDIE(const DISubprogram &SP) {
if (TopLevelDIEs.insert(SPDie)) if (TopLevelDIEs.insert(SPDie))
TopLevelDIEsVector.push_back(SPDie); TopLevelDIEsVector.push_back(SPDie);
SPDie = createRawSubprogramDIE(SP); SPDie = createRawSubprogramDIE(DW_Unit, SP);
// Add arguments. // Add arguments.
DICompositeType SPTy = SP.getType(); DICompositeType SPTy = SP.getType();
@ -1176,7 +1163,7 @@ DIE *DwarfDebug::createMemberSubprogramDIE(const DISubprogram &SP) {
if (SPTag == dwarf::DW_TAG_subroutine_type) if (SPTag == dwarf::DW_TAG_subroutine_type)
for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) { for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter); DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter);
addType(Arg, DIType(Args.getElement(i).getNode())); addType(DW_Unit, Arg, DIType(Args.getElement(i).getNode()));
addUInt(Arg, dwarf::DW_AT_artificial, dwarf::DW_FORM_flag, 1); // ?? addUInt(Arg, dwarf::DW_AT_artificial, dwarf::DW_FORM_flag, 1); // ??
SPDie->addChild(Arg); SPDie->addChild(Arg);
} }
@ -1186,12 +1173,13 @@ DIE *DwarfDebug::createMemberSubprogramDIE(const DISubprogram &SP) {
} }
/// createSubprogramDIE - Create new DIE using SP. /// createSubprogramDIE - Create new DIE using SP.
DIE *DwarfDebug::createSubprogramDIE(const DISubprogram &SP) { DIE *DwarfDebug::createSubprogramDIE(CompileUnit *DW_Unit,
const DISubprogram &SP) {
DIE *SPDie = ModuleCU->getDIE(SP.getNode()); DIE *SPDie = ModuleCU->getDIE(SP.getNode());
if (SPDie) if (SPDie)
return SPDie; return SPDie;
SPDie = createRawSubprogramDIE(SP); SPDie = createRawSubprogramDIE(DW_Unit, SP);
if (!SP.isDefinition()) { if (!SP.isDefinition()) {
addUInt(SPDie, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag, 1); addUInt(SPDie, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag, 1);
@ -1205,14 +1193,14 @@ DIE *DwarfDebug::createSubprogramDIE(const DISubprogram &SP) {
if (SPTag == dwarf::DW_TAG_subroutine_type) if (SPTag == dwarf::DW_TAG_subroutine_type)
for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) { for (unsigned i = 1, N = Args.getNumElements(); i < N; ++i) {
DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter); DIE *Arg = new DIE(dwarf::DW_TAG_formal_parameter);
addType(Arg, DIType(Args.getElement(i).getNode())); addType(DW_Unit, Arg, DIType(Args.getElement(i).getNode()));
addUInt(Arg, dwarf::DW_AT_artificial, dwarf::DW_FORM_flag, 1); // ?? addUInt(Arg, dwarf::DW_AT_artificial, dwarf::DW_FORM_flag, 1); // ??
SPDie->addChild(Arg); SPDie->addChild(Arg);
} }
} }
// DW_TAG_inlined_subroutine may refer to this DIE. // DW_TAG_inlined_subroutine may refer to this DIE.
ModuleCU->insertDIE(SP.getNode(), SPDie); DW_Unit->insertDIE(SP.getNode(), SPDie);
return SPDie; return SPDie;
} }
@ -1225,6 +1213,64 @@ CompileUnit &DwarfDebug::findCompileUnit(DICompileUnit Unit) const {
return *I->second; return *I->second;
} }
/// createDbgScopeVariable - Create a new scope variable.
///
DIE *DwarfDebug::createDbgScopeVariable(DbgVariable *DV, CompileUnit *Unit) {
// Get the descriptor.
const DIVariable &VD = DV->getVariable();
StringRef Name = VD.getName();
if (Name.empty())
return NULL;
// Translate tag to proper Dwarf tag. The result variable is dropped for
// now.
unsigned Tag;
switch (VD.getTag()) {
case dwarf::DW_TAG_return_variable:
return NULL;
case dwarf::DW_TAG_arg_variable:
Tag = dwarf::DW_TAG_formal_parameter;
break;
case dwarf::DW_TAG_auto_variable: // fall thru
default:
Tag = dwarf::DW_TAG_variable;
break;
}
// Define variable debug information entry.
DIE *VariableDie = new DIE(Tag);
addString(VariableDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, Name);
// Add source line info if available.
addSourceLine(VariableDie, &VD);
// Add variable type.
// FIXME: isBlockByrefVariable should be reformulated in terms of complex
// addresses instead.
if (VD.isBlockByrefVariable())
addType(Unit, VariableDie, getBlockByrefType(VD.getType(), Name));
else
addType(Unit, VariableDie, VD.getType());
// Add variable address.
// Variables for abstract instances of inlined functions don't get a
// location.
MachineLocation Location;
unsigned FrameReg;
int Offset = RI->getFrameIndexReference(*MF, DV->getFrameIndex(), FrameReg);
Location.set(FrameReg, Offset);
if (VD.hasComplexAddress())
addComplexAddress(DV, VariableDie, dwarf::DW_AT_location, Location);
else if (VD.isBlockByrefVariable())
addBlockByrefAddress(DV, VariableDie, dwarf::DW_AT_location, Location);
else
addAddress(VariableDie, dwarf::DW_AT_location, Location);
return VariableDie;
}
/// getUpdatedDbgScope - Find or create DbgScope assicated with the instruction. /// getUpdatedDbgScope - Find or create DbgScope assicated with the instruction.
/// Initialize scope and update scope hierarchy. /// Initialize scope and update scope hierarchy.
DbgScope *DwarfDebug::getUpdatedDbgScope(MDNode *N, const MachineInstr *MI, DbgScope *DwarfDebug::getUpdatedDbgScope(MDNode *N, const MachineInstr *MI,
@ -1330,7 +1376,7 @@ DIE *DwarfDebug::updateSubprogramScopeDIE(MDNode *SPNode) {
if (!N) continue; if (!N) continue;
DIGlobalVariable GV(N); DIGlobalVariable GV(N);
if (GV.getContext().getNode() == SPNode) { if (GV.getContext().getNode() == SPNode) {
DIE *ScopedGVDie = createGlobalVariableDIE(GV); DIE *ScopedGVDie = createGlobalVariableDIE(ModuleCU, GV);
if (ScopedGVDie) if (ScopedGVDie)
SPDie->addChild(ScopedGVDie); SPDie->addChild(ScopedGVDie);
} }
@ -1419,7 +1465,8 @@ DIE *DwarfDebug::constructInlinedScopeDIE(DbgScope *Scope) {
/// constructVariableDIE - Construct a DIE for the given DbgVariable. /// constructVariableDIE - Construct a DIE for the given DbgVariable.
DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) { DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV,
DbgScope *Scope, CompileUnit *Unit) {
// Get the descriptor. // Get the descriptor.
const DIVariable &VD = DV->getVariable(); const DIVariable &VD = DV->getVariable();
StringRef Name = VD.getName(); StringRef Name = VD.getName();
@ -1468,9 +1515,9 @@ DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) {
// FIXME: isBlockByrefVariable should be reformulated in terms of complex // FIXME: isBlockByrefVariable should be reformulated in terms of complex
// addresses instead. // addresses instead.
if (VD.isBlockByrefVariable()) if (VD.isBlockByrefVariable())
addType(VariableDie, getBlockByrefType(VD.getType(), Name)); addType(Unit, VariableDie, getBlockByrefType(VD.getType(), Name));
else else
addType(VariableDie, VD.getType()); addType(Unit, VariableDie, VD.getType());
} }
// Add variable address. // Add variable address.
@ -1539,7 +1586,7 @@ DIE *DwarfDebug::constructScopeDIE(DbgScope *Scope) {
// Add variables to scope. // Add variables to scope.
SmallVector<DbgVariable *, 8> &Variables = Scope->getVariables(); SmallVector<DbgVariable *, 8> &Variables = Scope->getVariables();
for (unsigned i = 0, N = Variables.size(); i < N; ++i) { for (unsigned i = 0, N = Variables.size(); i < N; ++i) {
DIE *VariableDIE = constructVariableDIE(Variables[i], Scope); DIE *VariableDIE = constructVariableDIE(Variables[i], Scope, ModuleCU);
if (VariableDIE) if (VariableDIE)
ScopeDIE->addChild(VariableDIE); ScopeDIE->addChild(VariableDIE);
} }
@ -1596,29 +1643,6 @@ unsigned DwarfDebug::GetOrCreateSourceID(StringRef DirName, StringRef FileName)
return SrcId; return SrcId;
} }
/// getOrCreateNameSpace - Create a DIE for DINameSpace.
DIE *DwarfDebug::getOrCreateNameSpace(DINameSpace &NS) {
DIE *NDie = ModuleCU->getDIE(NS.getNode());
if (NDie)
return NDie;
NDie = new DIE(dwarf::DW_TAG_namespace);
ModuleCU->insertDIE(NS.getNode(), NDie);
if (!NS.getName().empty())
addString(NDie, dwarf::DW_AT_name, dwarf::DW_FORM_string, NS.getName());
addSourceLine(NDie, &NS);
DIDescriptor NSContext = NS.getContext();
DIE *Context = NULL;
if (NSContext.isNameSpace()) {
DINameSpace NS2(NSContext.getNode());
Context = getOrCreateNameSpace(NS2);
}
else
Context = ModuleCU->getCUDie();
Context->addChild(NDie);
return NDie;
}
void DwarfDebug::constructCompileUnit(MDNode *N) { void DwarfDebug::constructCompileUnit(MDNode *N) {
DICompileUnit DIUnit(N); DICompileUnit DIUnit(N);
StringRef FN = DIUnit.getFilename(); StringRef FN = DIUnit.getFilename();
@ -1671,7 +1695,7 @@ void DwarfDebug::constructGlobalVariableDIE(MDNode *N) {
if (ModuleCU->getDIE(DI_GV.getNode())) if (ModuleCU->getDIE(DI_GV.getNode()))
return; return;
DIE *VariableDie = createGlobalVariableDIE(DI_GV); DIE *VariableDie = createGlobalVariableDIE(ModuleCU, DI_GV);
// Add to map. // Add to map.
ModuleCU->insertDIE(N, VariableDie); ModuleCU->insertDIE(N, VariableDie);
@ -1704,22 +1728,15 @@ void DwarfDebug::constructSubprogramDIE(MDNode *N) {
// class type. // class type.
return; return;
DIE *SubprogramDie = createSubprogramDIE(SP); DIE *SubprogramDie = createSubprogramDIE(ModuleCU, SP);
// Add to map. // Add to map.
ModuleCU->insertDIE(N, SubprogramDie); ModuleCU->insertDIE(N, SubprogramDie);
// Add to context owner. // Add to context owner.
DIDescriptor SPContext = SP.getContext(); if (SP.getContext().getNode() == SP.getCompileUnit().getNode())
if (SPContext.isCompileUnit()
&& SPContext.getNode() == SP.getCompileUnit().getNode()) {
if (TopLevelDIEs.insert(SubprogramDie)) if (TopLevelDIEs.insert(SubprogramDie))
TopLevelDIEsVector.push_back(SubprogramDie); TopLevelDIEsVector.push_back(SubprogramDie);
} else if (SPContext.isNameSpace()) {
DINameSpace NS(SPContext.getNode());
DIE *NDie = getOrCreateNameSpace(NS);
NDie->addChild(SubprogramDie);
}
// Expose as global. // Expose as global.
ModuleCU->addGlobal(SP.getName(), SubprogramDie); ModuleCU->addGlobal(SP.getName(), SubprogramDie);
@ -1763,20 +1780,10 @@ void DwarfDebug::beginModule(Module *M, MachineModuleInfo *mmi) {
for (DebugInfoFinder::iterator I = DbgFinder.global_variable_begin(), for (DebugInfoFinder::iterator I = DbgFinder.global_variable_begin(),
E = DbgFinder.global_variable_end(); I != E; ++I) { E = DbgFinder.global_variable_end(); I != E; ++I) {
DIGlobalVariable GV(*I); DIGlobalVariable GV(*I);
DIDescriptor GVContext = GV.getContext(); if (GV.getContext().getNode() != GV.getCompileUnit().getNode())
if (GVContext.isCompileUnit()
&& GVContext.getNode() == GV.getCompileUnit().getNode())
constructGlobalVariableDIE(*I);
else if (GVContext.isNameSpace()) {
DIE *GVDie = createGlobalVariableDIE(GV);
if (GVDie) {
DINameSpace NS(GVContext.getNode());
DIE *NDie = getOrCreateNameSpace(NS);
NDie->addChild(GVDie);
}
}
else
ScopedGVs.push_back(*I); ScopedGVs.push_back(*I);
else
constructGlobalVariableDIE(*I);
} }
// Create DIEs for each subprogram. // Create DIEs for each subprogram.
@ -2412,16 +2419,13 @@ void DwarfDebug::emitDIE(DIE *Die) {
} }
} }
/// emitDebugInfo - Emit the debug info section. /// emitDebugInfo / emitDebugInfoPerCU - Emit the debug info section.
/// ///
void DwarfDebug::emitDebugInfo() { void DwarfDebug::emitDebugInfoPerCU(CompileUnit *Unit) {
// Start debug info section. DIE *Die = Unit->getCUDie();
Asm->OutStreamer.SwitchSection(
Asm->getObjFileLowering().getDwarfInfoSection());
DIE *Die = ModuleCU->getCUDie();
// Emit the compile units header. // Emit the compile units header.
EmitLabel("info_begin", ModuleCU->getID()); EmitLabel("info_begin", Unit->getID());
// Emit size of content not including length itself // Emit size of content not including length itself
unsigned ContentSize = Die->getSize() + unsigned ContentSize = Die->getSize() +
@ -2442,10 +2446,17 @@ void DwarfDebug::emitDebugInfo() {
Asm->EmitInt8(0); Asm->EOL("Extra Pad For GDB"); Asm->EmitInt8(0); Asm->EOL("Extra Pad For GDB");
Asm->EmitInt8(0); Asm->EOL("Extra Pad For GDB"); Asm->EmitInt8(0); Asm->EOL("Extra Pad For GDB");
Asm->EmitInt8(0); Asm->EOL("Extra Pad For GDB"); Asm->EmitInt8(0); Asm->EOL("Extra Pad For GDB");
EmitLabel("info_end", ModuleCU->getID()); EmitLabel("info_end", Unit->getID());
Asm->EOL(); Asm->EOL();
}
void DwarfDebug::emitDebugInfo() {
// Start debug info section.
Asm->OutStreamer.SwitchSection(
Asm->getObjFileLowering().getDwarfInfoSection());
emitDebugInfoPerCU(ModuleCU);
} }
/// emitAbbreviations - Emit the abbreviation section. /// emitAbbreviations - Emit the abbreviation section.
@ -2743,30 +2754,24 @@ DwarfDebug::emitFunctionDebugFrame(const FunctionDebugFrameInfo&DebugFrameInfo){
Asm->EOL(); Asm->EOL();
} }
/// emitDebugPubNames - Emit visible names into a debug pubnames section. void DwarfDebug::emitDebugPubNamesPerCU(CompileUnit *Unit) {
/// EmitDifference("pubnames_end", Unit->getID(),
void DwarfDebug::emitDebugPubNames() { "pubnames_begin", Unit->getID(), true);
// Start the dwarf pubnames section.
Asm->OutStreamer.SwitchSection(
Asm->getObjFileLowering().getDwarfPubNamesSection());
EmitDifference("pubnames_end", ModuleCU->getID(),
"pubnames_begin", ModuleCU->getID(), true);
Asm->EOL("Length of Public Names Info"); Asm->EOL("Length of Public Names Info");
EmitLabel("pubnames_begin", ModuleCU->getID()); EmitLabel("pubnames_begin", Unit->getID());
Asm->EmitInt16(dwarf::DWARF_VERSION); Asm->EOL("DWARF Version"); Asm->EmitInt16(dwarf::DWARF_VERSION); Asm->EOL("DWARF Version");
EmitSectionOffset("info_begin", "section_info", EmitSectionOffset("info_begin", "section_info",
ModuleCU->getID(), 0, true, false); Unit->getID(), 0, true, false);
Asm->EOL("Offset of Compilation Unit Info"); Asm->EOL("Offset of Compilation Unit Info");
EmitDifference("info_end", ModuleCU->getID(), "info_begin", ModuleCU->getID(), EmitDifference("info_end", Unit->getID(), "info_begin", Unit->getID(),
true); true);
Asm->EOL("Compilation Unit Length"); Asm->EOL("Compilation Unit Length");
const StringMap<DIE*> &Globals = ModuleCU->getGlobals(); const StringMap<DIE*> &Globals = Unit->getGlobals();
for (StringMap<DIE*>::const_iterator for (StringMap<DIE*>::const_iterator
GI = Globals.begin(), GE = Globals.end(); GI != GE; ++GI) { GI = Globals.begin(), GE = Globals.end(); GI != GE; ++GI) {
const char *Name = GI->getKeyData(); const char *Name = GI->getKeyData();
@ -2777,11 +2782,21 @@ void DwarfDebug::emitDebugPubNames() {
} }
Asm->EmitInt32(0); Asm->EOL("End Mark"); Asm->EmitInt32(0); Asm->EOL("End Mark");
EmitLabel("pubnames_end", ModuleCU->getID()); EmitLabel("pubnames_end", Unit->getID());
Asm->EOL(); Asm->EOL();
} }
/// emitDebugPubNames - Emit visible names into a debug pubnames section.
///
void DwarfDebug::emitDebugPubNames() {
// Start the dwarf pubnames section.
Asm->OutStreamer.SwitchSection(
Asm->getObjFileLowering().getDwarfPubNamesSection());
emitDebugPubNamesPerCU(ModuleCU);
}
void DwarfDebug::emitDebugPubTypes() { void DwarfDebug::emitDebugPubTypes() {
// Start the dwarf pubnames section. // Start the dwarf pubnames section.
Asm->OutStreamer.SwitchSection( Asm->OutStreamer.SwitchSection(

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

@ -289,7 +289,6 @@ class DwarfDebug : public Dwarf {
void addSourceLine(DIE *Die, const DIGlobal *G); void addSourceLine(DIE *Die, const DIGlobal *G);
void addSourceLine(DIE *Die, const DISubprogram *SP); void addSourceLine(DIE *Die, const DISubprogram *SP);
void addSourceLine(DIE *Die, const DIType *Ty); void addSourceLine(DIE *Die, const DIType *Ty);
void addSourceLine(DIE *Die, const DINameSpace *NS);
/// addAddress - Add an address attribute to a die based on the location /// addAddress - Add an address attribute to a die based on the location
/// provided. /// provided.
@ -315,58 +314,60 @@ class DwarfDebug : public Dwarf {
const MachineLocation &Location); const MachineLocation &Location);
/// addType - Add a new type attribute to the specified entity. /// addType - Add a new type attribute to the specified entity.
void addType(DIE *Entity, DIType Ty); void addType(CompileUnit *DW_Unit, DIE *Entity, DIType Ty);
void addPubTypes(DISubprogram SP); void addPubTypes(DISubprogram SP);
/// constructTypeDIE - Construct basic type die from DIBasicType. /// constructTypeDIE - Construct basic type die from DIBasicType.
void constructTypeDIE(DIE &Buffer, void constructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DIBasicType BTy); DIBasicType BTy);
/// constructTypeDIE - Construct derived type die from DIDerivedType. /// constructTypeDIE - Construct derived type die from DIDerivedType.
void constructTypeDIE(DIE &Buffer, void constructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DIDerivedType DTy); DIDerivedType DTy);
/// constructTypeDIE - Construct type DIE from DICompositeType. /// constructTypeDIE - Construct type DIE from DICompositeType.
void constructTypeDIE(DIE &Buffer, void constructTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DICompositeType CTy); DICompositeType CTy);
/// constructSubrangeDIE - Construct subrange DIE from DISubrange. /// constructSubrangeDIE - Construct subrange DIE from DISubrange.
void constructSubrangeDIE(DIE &Buffer, DISubrange SR, DIE *IndexTy); void constructSubrangeDIE(DIE &Buffer, DISubrange SR, DIE *IndexTy);
/// constructArrayTypeDIE - Construct array type DIE from DICompositeType. /// constructArrayTypeDIE - Construct array type DIE from DICompositeType.
void constructArrayTypeDIE(DIE &Buffer, void constructArrayTypeDIE(CompileUnit *DW_Unit, DIE &Buffer,
DICompositeType *CTy); DICompositeType *CTy);
/// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator. /// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator.
DIE *constructEnumTypeDIE(DIEnumerator *ETy); DIE *constructEnumTypeDIE(CompileUnit *DW_Unit, DIEnumerator *ETy);
/// getOrCreateNameSpace - Create a DIE for DINameSpace.
DIE *getOrCreateNameSpace(DINameSpace &NS);
/// createGlobalVariableDIE - Create new DIE using GV. /// createGlobalVariableDIE - Create new DIE using GV.
DIE *createGlobalVariableDIE(const DIGlobalVariable &GV); DIE *createGlobalVariableDIE(CompileUnit *DW_Unit,
const DIGlobalVariable &GV);
/// createMemberDIE - Create new member DIE. /// createMemberDIE - Create new member DIE.
DIE *createMemberDIE(const DIDerivedType &DT); DIE *createMemberDIE(CompileUnit *DW_Unit, const DIDerivedType &DT);
/// createSubprogramDIE - Create new DIE using SP. /// createSubprogramDIE - Create new DIE using SP.
DIE *createSubprogramDIE(const DISubprogram &SP); DIE *createSubprogramDIE(CompileUnit *DW_Unit, const DISubprogram &SP);
/// createMemberSubprogramDIE - Create new member DIE using SP. This /// createMemberSubprogramDIE - Create new member DIE using SP. This
/// routine always returns a die with DW_AT_declaration attribute. /// routine always returns a die with DW_AT_declaration attribute.
DIE *createMemberSubprogramDIE(const DISubprogram &SP); DIE *createMemberSubprogramDIE(CompileUnit *DW_Unit, const DISubprogram &SP);
/// createRawSubprogramDIE - Create new partially incomplete DIE. This is /// createRawSubprogramDIE - Create new partially incomplete DIE. This is
/// a helper routine used by createMemberSubprogramDIE and /// a helper routine used by createMemberSubprogramDIE and
/// createSubprogramDIE. /// createSubprogramDIE.
DIE *createRawSubprogramDIE(const DISubprogram &SP); DIE *createRawSubprogramDIE(CompileUnit *DW_Unit, const DISubprogram &SP);
/// findCompileUnit - Get the compile unit for the given descriptor. /// findCompileUnit - Get the compile unit for the given descriptor.
/// ///
CompileUnit &findCompileUnit(DICompileUnit Unit) const; CompileUnit &findCompileUnit(DICompileUnit Unit) const;
/// createDbgScopeVariable - Create a new scope variable.
///
DIE *createDbgScopeVariable(DbgVariable *DV, CompileUnit *Unit);
/// getUpdatedDbgScope - Find or create DbgScope assicated with /// getUpdatedDbgScope - Find or create DbgScope assicated with
/// the instruction. Initialize scope and update scope hierarchy. /// the instruction. Initialize scope and update scope hierarchy.
DbgScope *getUpdatedDbgScope(MDNode *N, const MachineInstr *MI, MDNode *InlinedAt); DbgScope *getUpdatedDbgScope(MDNode *N, const MachineInstr *MI, MDNode *InlinedAt);
@ -396,7 +397,7 @@ class DwarfDebug : public Dwarf {
DIE *constructInlinedScopeDIE(DbgScope *Scope); DIE *constructInlinedScopeDIE(DbgScope *Scope);
/// constructVariableDIE - Construct a DIE for the given DbgVariable. /// constructVariableDIE - Construct a DIE for the given DbgVariable.
DIE *constructVariableDIE(DbgVariable *DV, DbgScope *S); DIE *constructVariableDIE(DbgVariable *DV, DbgScope *S, CompileUnit *Unit);
/// constructScopeDIE - Construct a DIE for this scope. /// constructScopeDIE - Construct a DIE for this scope.
DIE *constructScopeDIE(DbgScope *Scope); DIE *constructScopeDIE(DbgScope *Scope);
@ -417,8 +418,10 @@ class DwarfDebug : public Dwarf {
/// ///
void computeSizeAndOffsets(); void computeSizeAndOffsets();
/// EmitDebugInfo - Emit the debug info section. /// EmitDebugInfo / emitDebugInfoPerCU - Emit the debug info section.
/// ///
void emitDebugInfoPerCU(CompileUnit *Unit);
void emitDebugInfo(); void emitDebugInfo();
/// emitAbbreviations - Emit the abbreviation section. /// emitAbbreviations - Emit the abbreviation section.
@ -442,6 +445,8 @@ class DwarfDebug : public Dwarf {
/// section. /// section.
void emitFunctionDebugFrame(const FunctionDebugFrameInfo &DebugFrameInfo); void emitFunctionDebugFrame(const FunctionDebugFrameInfo &DebugFrameInfo);
void emitDebugPubNamesPerCU(CompileUnit *Unit);
/// emitDebugPubNames - Emit visible names into a debug pubnames section. /// emitDebugPubNames - Emit visible names into a debug pubnames section.
/// ///
void emitDebugPubNames(); void emitDebugPubNames();

18
llvm/test/DebugInfo/2009-12-08-DeadGV.ll
View File

@ -1,18 +0,0 @@
; RUN: llc %s -o /dev/null
; PR 5713
define i32 @_Z3foov() nounwind readnone ssp {
entry:
ret i32 0, !dbg !4
}
!llvm.dbg.gv = !{!0}
!0 = metadata !{i32 458804, i32 0, metadata !1, metadata !"X", metadata !"X", metadata !"_ZN1A1XE", metadata !2, i32 3, metadata !3, i1 false, i1 true, null}; [DW_TAG_variable ]
!1 = metadata !{i32 458809, metadata !2, metadata !"A", metadata !2, i32 2}; [DW_TAG_namespace ]
!2 = metadata !{i32 458769, i32 0, i32 4, metadata !"ng.cc", metadata !"/tmp", metadata !"4.2.1 (Based on Apple Inc. build 5653) (LLVM build)", i1 true, i1 true, metadata !"", i32 0}; [DW_TAG_compile_unit ]
!3 = metadata !{i32 458788, metadata !2, metadata !"int", metadata !2, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5}; [DW_TAG_base_type ]
!4 = metadata !{i32 7, i32 0, metadata !5, null}
!5 = metadata !{i32 458798, i32 0, metadata !2, metadata !"foo", metadata !"foo", metadata !"_Z3foov", metadata !2, i32 6, metadata !6, i1 false, i1 true, i32 0, i32 0, null}; [DW_TAG_subprogram ]
!6 = metadata !{i32 458773, metadata !2, metadata !"", metadata !2, i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0}; [DW_TAG_subroutine_type ]
!7 = metadata !{metadata !3}