Debug Info: code clean up.

Remove the unneeded return values from createMemberDIE, constructEnumTypeDIE,
getOrCreateTemplateTypeParameterDIE, and getOrCreateTemplateValueParameterDIE.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193285 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Manman Ren
2013-10-23 22:57:12 +00:00
parent 950f4e82af
commit 99addee733
2 changed files with 12 additions and 18 deletions

View File

@@ -1165,9 +1165,9 @@ void CompileUnit::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
dwarf::DW_AT_friend); dwarf::DW_AT_friend);
Buffer.addChild(ElemDie); Buffer.addChild(ElemDie);
} else if (DDTy.isStaticMember()) { } else if (DDTy.isStaticMember()) {
ElemDie = getOrCreateStaticMemberDIE(DDTy); getOrCreateStaticMemberDIE(DDTy);
} else { } else {
ElemDie = createMemberDIE(Buffer, DDTy); createMemberDIE(Buffer, DDTy);
} }
} else if (Element.isObjCProperty()) { } else if (Element.isObjCProperty()) {
DIObjCProperty Property(Element); DIObjCProperty Property(Element);
@@ -1269,12 +1269,12 @@ void CompileUnit::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
/// getOrCreateTemplateTypeParameterDIE - Find existing DIE or create new DIE /// getOrCreateTemplateTypeParameterDIE - Find existing DIE or create new DIE
/// for the given DITemplateTypeParameter. /// for the given DITemplateTypeParameter.
DIE * void
CompileUnit::getOrCreateTemplateTypeParameterDIE(DIE &Buffer, CompileUnit::getOrCreateTemplateTypeParameterDIE(DIE &Buffer,
DITemplateTypeParameter TP) { DITemplateTypeParameter TP) {
DIE *ParamDIE = getDIE(TP); DIE *ParamDIE = getDIE(TP);
if (ParamDIE) if (ParamDIE)
return ParamDIE; return;
ParamDIE = new DIE(dwarf::DW_TAG_template_type_parameter); ParamDIE = new DIE(dwarf::DW_TAG_template_type_parameter);
Buffer.addChild(ParamDIE); Buffer.addChild(ParamDIE);
@@ -1283,17 +1283,16 @@ CompileUnit::getOrCreateTemplateTypeParameterDIE(DIE &Buffer,
addType(ParamDIE, resolve(TP.getType())); addType(ParamDIE, resolve(TP.getType()));
if (!TP.getName().empty()) if (!TP.getName().empty())
addString(ParamDIE, dwarf::DW_AT_name, TP.getName()); addString(ParamDIE, dwarf::DW_AT_name, TP.getName());
return ParamDIE;
} }
/// getOrCreateTemplateValueParameterDIE - Find existing DIE or create new DIE /// getOrCreateTemplateValueParameterDIE - Find existing DIE or create new DIE
/// for the given DITemplateValueParameter. /// for the given DITemplateValueParameter.
DIE * void
CompileUnit::getOrCreateTemplateValueParameterDIE(DIE &Buffer, CompileUnit::getOrCreateTemplateValueParameterDIE(DIE &Buffer,
DITemplateValueParameter VP) { DITemplateValueParameter VP) {
DIE *ParamDIE = getDIE(VP); DIE *ParamDIE = getDIE(VP);
if (ParamDIE) if (ParamDIE)
return ParamDIE; return;
ParamDIE = new DIE(VP.getTag()); ParamDIE = new DIE(VP.getTag());
Buffer.addChild(ParamDIE); Buffer.addChild(ParamDIE);
@@ -1327,8 +1326,6 @@ CompileUnit::getOrCreateTemplateValueParameterDIE(DIE &Buffer,
addTemplateParams(*ParamDIE, A); addTemplateParams(*ParamDIE, A);
} }
} }
return ParamDIE;
} }
/// getOrCreateNameSpace - Create a DIE for DINameSpace. /// getOrCreateNameSpace - Create a DIE for DINameSpace.
@@ -1687,14 +1684,13 @@ void CompileUnit::constructArrayTypeDIE(DIE &Buffer, DICompositeType *CTy) {
} }
/// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator. /// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator.
DIE *CompileUnit::constructEnumTypeDIE(DIE &Buffer, DIEnumerator ETy) { void CompileUnit::constructEnumTypeDIE(DIE &Buffer, DIEnumerator ETy) {
DIE *Enumerator = new DIE(dwarf::DW_TAG_enumerator); DIE *Enumerator = new DIE(dwarf::DW_TAG_enumerator);
Buffer.addChild(Enumerator); Buffer.addChild(Enumerator);
StringRef Name = ETy.getName(); StringRef Name = ETy.getName();
addString(Enumerator, dwarf::DW_AT_name, Name); addString(Enumerator, dwarf::DW_AT_name, Name);
int64_t Value = ETy.getEnumValue(); int64_t Value = ETy.getEnumValue();
addSInt(Enumerator, dwarf::DW_AT_const_value, dwarf::DW_FORM_sdata, Value); addSInt(Enumerator, dwarf::DW_AT_const_value, dwarf::DW_FORM_sdata, Value);
return Enumerator;
} }
/// constructContainingTypeDIEs - Construct DIEs for types that contain /// constructContainingTypeDIEs - Construct DIEs for types that contain
@@ -1788,7 +1784,7 @@ DIE *CompileUnit::constructVariableDIE(DbgVariable *DV, bool isScopeAbstract) {
} }
/// createMemberDIE - Create new member DIE. /// createMemberDIE - Create new member DIE.
DIE *CompileUnit::createMemberDIE(DIE &Buffer, DIDerivedType DT) { void CompileUnit::createMemberDIE(DIE &Buffer, DIDerivedType DT) {
DIE *MemberDie = new DIE(DT.getTag()); DIE *MemberDie = new DIE(DT.getTag());
Buffer.addChild(MemberDie); Buffer.addChild(MemberDie);
StringRef Name = DT.getName(); StringRef Name = DT.getName();
@@ -1871,8 +1867,6 @@ DIE *CompileUnit::createMemberDIE(DIE &Buffer, DIDerivedType DT) {
if (DT.isArtificial()) if (DT.isArtificial())
addFlag(MemberDie, dwarf::DW_AT_artificial); addFlag(MemberDie, dwarf::DW_AT_artificial);
return MemberDie;
} }
/// getOrCreateStaticMemberDIE - Create new DIE for C++ static member. /// getOrCreateStaticMemberDIE - Create new DIE for C++ static member.

View File

@@ -328,19 +328,19 @@ private:
void constructArrayTypeDIE(DIE &Buffer, DICompositeType *CTy); void constructArrayTypeDIE(DIE &Buffer, DICompositeType *CTy);
/// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator. /// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator.
DIE *constructEnumTypeDIE(DIE &Buffer, DIEnumerator ETy); void constructEnumTypeDIE(DIE &Buffer, DIEnumerator ETy);
/// createMemberDIE - Create new member DIE. /// createMemberDIE - Create new member DIE.
DIE *createMemberDIE(DIE &Buffer, DIDerivedType DT); void createMemberDIE(DIE &Buffer, DIDerivedType DT);
/// getOrCreateTemplateTypeParameterDIE - Find existing DIE or create new DIE /// getOrCreateTemplateTypeParameterDIE - Find existing DIE or create new DIE
/// for the given DITemplateTypeParameter. /// for the given DITemplateTypeParameter.
DIE *getOrCreateTemplateTypeParameterDIE(DIE &Buffer, void getOrCreateTemplateTypeParameterDIE(DIE &Buffer,
DITemplateTypeParameter TP); DITemplateTypeParameter TP);
/// getOrCreateTemplateValueParameterDIE - Find existing DIE or create /// getOrCreateTemplateValueParameterDIE - Find existing DIE or create
/// new DIE for the given DITemplateValueParameter. /// new DIE for the given DITemplateValueParameter.
DIE *getOrCreateTemplateValueParameterDIE(DIE &Buffer, void getOrCreateTemplateValueParameterDIE(DIE &Buffer,
DITemplateValueParameter TVP); DITemplateValueParameter TVP);
/// getOrCreateStaticMemberDIE - Create new static data member DIE. /// getOrCreateStaticMemberDIE - Create new static data member DIE.