mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Simplify. Avoid redundant checks.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110621 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
5cb33a384f
commit
450b793a04
@ -1186,30 +1186,6 @@ static StringRef getRealLinkageName(StringRef LinkageName) {
|
|||||||
return LinkageName;
|
return LinkageName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// createGlobalVariableDIE - Create new DIE using GV.
|
|
||||||
DIE *DwarfDebug::createGlobalVariableDIE(const DIGlobalVariable &GV) {
|
|
||||||
// If the global variable was optmized out then no need to create debug info
|
|
||||||
// entry.
|
|
||||||
if (!GV.Verify()) return NULL;
|
|
||||||
if (GV.getDisplayName().empty()) return NULL;
|
|
||||||
|
|
||||||
DIE *GVDie = new DIE(dwarf::DW_TAG_variable);
|
|
||||||
addString(GVDie, dwarf::DW_AT_name, dwarf::DW_FORM_string,
|
|
||||||
GV.getDisplayName());
|
|
||||||
|
|
||||||
StringRef LinkageName = GV.getLinkageName();
|
|
||||||
if (!LinkageName.empty())
|
|
||||||
addString(GVDie, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
|
|
||||||
getRealLinkageName(LinkageName));
|
|
||||||
|
|
||||||
addType(GVDie, GV.getType());
|
|
||||||
if (!GV.isLocalToUnit())
|
|
||||||
addUInt(GVDie, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1);
|
|
||||||
addSourceLine(GVDie, GV);
|
|
||||||
|
|
||||||
return GVDie;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// createMemberDIE - Create new member DIE.
|
/// createMemberDIE - Create new member DIE.
|
||||||
DIE *DwarfDebug::createMemberDIE(const DIDerivedType &DT) {
|
DIE *DwarfDebug::createMemberDIE(const DIDerivedType &DT) {
|
||||||
DIE *MemberDie = new DIE(DT.getTag());
|
DIE *MemberDie = new DIE(DT.getTag());
|
||||||
@ -1888,57 +1864,68 @@ CompileUnit *DwarfDebug::getCompileUnit(const MDNode *N) const {
|
|||||||
|
|
||||||
/// constructGlobalVariableDIE - Construct global variable DIE.
|
/// constructGlobalVariableDIE - Construct global variable DIE.
|
||||||
void DwarfDebug::constructGlobalVariableDIE(const MDNode *N) {
|
void DwarfDebug::constructGlobalVariableDIE(const MDNode *N) {
|
||||||
DIGlobalVariable DI_GV(N);
|
DIGlobalVariable GV(N);
|
||||||
|
|
||||||
// If debug information is malformed then ignore it.
|
// If debug information is malformed then ignore it.
|
||||||
if (DI_GV.Verify() == false)
|
if (GV.Verify() == false)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Check for pre-existence.
|
// Check for pre-existence.
|
||||||
CompileUnit *TheCU = getCompileUnit(N);
|
CompileUnit *TheCU = getCompileUnit(N);
|
||||||
if (TheCU->getDIE(DI_GV))
|
if (TheCU->getDIE(GV))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DIE *VariableDie = createGlobalVariableDIE(DI_GV);
|
DIType GTy = GV.getType();
|
||||||
if (!VariableDie)
|
DIE *VariableDIE = new DIE(dwarf::DW_TAG_variable);
|
||||||
return;
|
|
||||||
|
|
||||||
// Add to map.
|
// Add name.
|
||||||
TheCU->insertDIE(N, VariableDie);
|
addString(VariableDIE, dwarf::DW_AT_name, dwarf::DW_FORM_string,
|
||||||
|
GV.getDisplayName());
|
||||||
// Add to context owner.
|
StringRef LinkageName = GV.getLinkageName();
|
||||||
DIDescriptor GVContext = DI_GV.getContext();
|
if (!LinkageName.empty())
|
||||||
DIEBlock *Block = new (DIEValueAllocator) DIEBlock();
|
addString(VariableDIE, dwarf::DW_AT_MIPS_linkage_name, dwarf::DW_FORM_string,
|
||||||
addUInt(Block, 0, dwarf::DW_FORM_data1, dwarf::DW_OP_addr);
|
getRealLinkageName(LinkageName));
|
||||||
addLabel(Block, 0, dwarf::DW_FORM_udata,
|
// Add type.
|
||||||
Asm->Mang->getSymbol(DI_GV.getGlobal()));
|
addType(VariableDIE, GTy);
|
||||||
// Do not create specification DIE if context is either compile unit
|
|
||||||
// or a subprogram.
|
|
||||||
if (DI_GV.isDefinition() && !GVContext.isCompileUnit() &&
|
|
||||||
!GVContext.isFile() &&
|
|
||||||
!isSubprogramContext(GVContext)) {
|
|
||||||
// Create specification DIE.
|
|
||||||
DIE *VariableSpecDIE = new DIE(dwarf::DW_TAG_variable);
|
|
||||||
addDIEEntry(VariableSpecDIE, dwarf::DW_AT_specification,
|
|
||||||
dwarf::DW_FORM_ref4, VariableDie);
|
|
||||||
addBlock(VariableSpecDIE, dwarf::DW_AT_location, 0, Block);
|
|
||||||
addUInt(VariableDie, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag, 1);
|
|
||||||
TheCU->addDie(VariableSpecDIE);
|
|
||||||
} else {
|
|
||||||
addBlock(VariableDie, dwarf::DW_AT_location, 0, Block);
|
|
||||||
}
|
|
||||||
addToContextOwner(VariableDie, GVContext);
|
|
||||||
|
|
||||||
// Expose as global. FIXME - need to check external flag.
|
|
||||||
TheCU->addGlobal(DI_GV.getName(), VariableDie);
|
|
||||||
|
|
||||||
DIType GTy = DI_GV.getType();
|
|
||||||
if (GTy.isCompositeType() && !GTy.getName().empty()
|
if (GTy.isCompositeType() && !GTy.getName().empty()
|
||||||
&& !GTy.isForwardDecl()) {
|
&& !GTy.isForwardDecl()) {
|
||||||
DIEEntry *Entry = TheCU->getDIEEntry(GTy);
|
DIEEntry *Entry = TheCU->getDIEEntry(GTy);
|
||||||
assert(Entry && "Missing global type!");
|
assert(Entry && "Missing global type!");
|
||||||
TheCU->addGlobalType(GTy.getName(), Entry->getEntry());
|
TheCU->addGlobalType(GTy.getName(), Entry->getEntry());
|
||||||
}
|
}
|
||||||
|
// Add scoping info.
|
||||||
|
if (!GV.isLocalToUnit()) {
|
||||||
|
addUInt(VariableDIE, dwarf::DW_AT_external, dwarf::DW_FORM_flag, 1);
|
||||||
|
// Expose as global.
|
||||||
|
TheCU->addGlobal(GV.getName(), VariableDIE);
|
||||||
|
}
|
||||||
|
// Add line number info.
|
||||||
|
addSourceLine(VariableDIE, GV);
|
||||||
|
// Add to map.
|
||||||
|
TheCU->insertDIE(N, VariableDIE);
|
||||||
|
// Add to context owner.
|
||||||
|
DIDescriptor GVContext = GV.getContext();
|
||||||
|
addToContextOwner(VariableDIE, GVContext);
|
||||||
|
// Add location.
|
||||||
|
DIEBlock *Block = new (DIEValueAllocator) DIEBlock();
|
||||||
|
addUInt(Block, 0, dwarf::DW_FORM_data1, dwarf::DW_OP_addr);
|
||||||
|
addLabel(Block, 0, dwarf::DW_FORM_udata,
|
||||||
|
Asm->Mang->getSymbol(GV.getGlobal()));
|
||||||
|
// Do not create specification DIE if context is either compile unit
|
||||||
|
// or a subprogram.
|
||||||
|
if (GV.isDefinition() && !GVContext.isCompileUnit() &&
|
||||||
|
!GVContext.isFile() && !isSubprogramContext(GVContext)) {
|
||||||
|
// Create specification DIE.
|
||||||
|
DIE *VariableSpecDIE = new DIE(dwarf::DW_TAG_variable);
|
||||||
|
addDIEEntry(VariableSpecDIE, dwarf::DW_AT_specification,
|
||||||
|
dwarf::DW_FORM_ref4, VariableDIE);
|
||||||
|
addBlock(VariableSpecDIE, dwarf::DW_AT_location, 0, Block);
|
||||||
|
addUInt(VariableDIE, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag, 1);
|
||||||
|
TheCU->addDie(VariableSpecDIE);
|
||||||
|
} else {
|
||||||
|
addBlock(VariableDIE, dwarf::DW_AT_location, 0, Block);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -418,9 +418,6 @@ private:
|
|||||||
/// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator.
|
/// constructEnumTypeDIE - Construct enum type DIE from DIEnumerator.
|
||||||
DIE *constructEnumTypeDIE(DIEnumerator ETy);
|
DIE *constructEnumTypeDIE(DIEnumerator ETy);
|
||||||
|
|
||||||
/// createGlobalVariableDIE - Create new DIE using GV.
|
|
||||||
DIE *createGlobalVariableDIE(const DIGlobalVariable &GV);
|
|
||||||
|
|
||||||
/// createMemberDIE - Create new member DIE.
|
/// createMemberDIE - Create new member DIE.
|
||||||
DIE *createMemberDIE(const DIDerivedType &DT);
|
DIE *createMemberDIE(const DIDerivedType &DT);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user