maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[codeview] Remove ClassInfoMap 

From a design perspective, complete record type emission should not
depend on information from other complete record types.

Currently this map is unused, and needlessly accumulates data throughout
compilation.

llvm-svn: 273431
This commit is contained in:
Reid Kleckner 2016-06-22 16:06:42 +00:00
parent 69317f2ec2
commit 1ab7eac84b
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
View File

@ -1337,7 +1337,6 @@ void CodeViewDebug::clear() {
GlobalUDTs.clear(); GlobalUDTs.clear();
TypeIndices.clear(); TypeIndices.clear();
CompleteTypeIndices.clear(); CompleteTypeIndices.clear();
ClassInfoMap.clear();
} }
void CodeViewDebug::collectMemberInfo(ClassInfo &Info, void CodeViewDebug::collectMemberInfo(ClassInfo &Info,
@ -1346,29 +1345,20 @@ void CodeViewDebug::collectMemberInfo(ClassInfo &Info,
Info.Members.push_back({DDTy, 0}); Info.Members.push_back({DDTy, 0});
return; return;
} }
// Member with no name, must be nested structure/union, collects its memebers // An unnamed member must represent a nested struct or union. Add all the
// indirect fields to the current record.
assert((DDTy->getOffsetInBits() % 8) == 0 && "Unnamed bitfield member!"); assert((DDTy->getOffsetInBits() % 8) == 0 && "Unnamed bitfield member!");
unsigned offset = DDTy->getOffsetInBits() / 8; unsigned Offset = DDTy->getOffsetInBits() / 8;
const DIType *Ty = DDTy->getBaseType().resolve(); const DIType *Ty = DDTy->getBaseType().resolve();
const DICompositeType *DCTy = cast<DICompositeType>(Ty); const DICompositeType *DCTy = cast<DICompositeType>(Ty);
ClassInfo &NestedInfo = collectClassInfo(DCTy); ClassInfo NestedInfo = collectClassInfo(DCTy);
ClassInfo::MemberList &Members = NestedInfo.Members; for (const ClassInfo::MemberInfo &IndirectField : NestedInfo.Members)
for (unsigned i = 0, e = Members.size(); i != e; ++i)
Info.Members.push_back( Info.Members.push_back(
{Members[i].MemberTypeNode, Members[i].BaseOffset + offset}); {IndirectField.MemberTypeNode, IndirectField.BaseOffset + Offset});
} }
ClassInfo &CodeViewDebug::collectClassInfo(const DICompositeType *Ty) { ClassInfo CodeViewDebug::collectClassInfo(const DICompositeType *Ty) {
auto Insertion = ClassInfoMap.insert({Ty, std::unique_ptr<ClassInfo>()}); ClassInfo Info;
ClassInfo *Info = nullptr;
{
std::unique_ptr<ClassInfo> &InfoEntry = Insertion.first->second;
if (!Insertion.second)
return *InfoEntry;
InfoEntry.reset(new ClassInfo());
Info = InfoEntry.get();
}
// Add elements to structure type. // Add elements to structure type.
DINodeArray Elements = Ty->getElements(); DINodeArray Elements = Ty->getElements();
for (auto *Element : Elements) { for (auto *Element : Elements) {
@ -1380,10 +1370,10 @@ ClassInfo &CodeViewDebug::collectClassInfo(const DICompositeType *Ty) {
// Non-virtual methods does not need the introduced marker. // Non-virtual methods does not need the introduced marker.
// Set it to false. // Set it to false.
bool Introduced = false; bool Introduced = false;
Info->Methods[SP->getRawName()].push_back({SP, Introduced}); Info.Methods[SP->getRawName()].push_back({SP, Introduced});
} else if (auto *DDTy = dyn_cast<DIDerivedType>(Element)) { } else if (auto *DDTy = dyn_cast<DIDerivedType>(Element)) {
if (DDTy->getTag() == dwarf::DW_TAG_member) if (DDTy->getTag() == dwarf::DW_TAG_member)
collectMemberInfo(*Info, DDTy); collectMemberInfo(Info, DDTy);
else if (DDTy->getTag() == dwarf::DW_TAG_inheritance) { else if (DDTy->getTag() == dwarf::DW_TAG_inheritance) {
// FIXME: collect class info from inheritance. // FIXME: collect class info from inheritance.
} else if (DDTy->getTag() == dwarf::DW_TAG_friend) { } else if (DDTy->getTag() == dwarf::DW_TAG_friend) {
@ -1396,8 +1386,7 @@ ClassInfo &CodeViewDebug::collectClassInfo(const DICompositeType *Ty) {
} }
// Skip other unrecognized kinds of elements. // Skip other unrecognized kinds of elements.
} }
return Info;
return *Info;
} }
TypeIndex CodeViewDebug::lowerTypeClass(const DICompositeType *Ty) { TypeIndex CodeViewDebug::lowerTypeClass(const DICompositeType *Ty) {
@ -1466,7 +1455,7 @@ CodeViewDebug::lowerRecordFieldList(const DICompositeType *Ty) {
// contributes to this count, even though the overload group is a single field // contributes to this count, even though the overload group is a single field
// list record. // list record.
unsigned MemberCount = 0; unsigned MemberCount = 0;
ClassInfo &Info = collectClassInfo(Ty); ClassInfo Info = collectClassInfo(Ty);
FieldListRecordBuilder Fields; FieldListRecordBuilder Fields;
// Create members. // Create members.

4
llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.h
View File

@ -150,8 +150,6 @@ class LLVM_LIBRARY_VISIBILITY CodeViewDebug : public DebugHandlerBase {
/// always looked up in the normal TypeIndices map. /// always looked up in the normal TypeIndices map.
DenseMap<const DICompositeType *, codeview::TypeIndex> CompleteTypeIndices; DenseMap<const DICompositeType *, codeview::TypeIndex> CompleteTypeIndices;
/// Map from DICompositeType* to class info.
DenseMap<const DICompositeType *, std::unique_ptr<ClassInfo>> ClassInfoMap;
const DISubprogram *CurrentSubprogram = nullptr; const DISubprogram *CurrentSubprogram = nullptr;
// The UDTs we have seen while processing types; each entry is a pair of type // The UDTs we have seen while processing types; each entry is a pair of type
@ -249,7 +247,7 @@ class LLVM_LIBRARY_VISIBILITY CodeViewDebug : public DebugHandlerBase {
codeview::TypeIndex lowerCompleteTypeUnion(const DICompositeType *Ty); codeview::TypeIndex lowerCompleteTypeUnion(const DICompositeType *Ty);
void collectMemberInfo(ClassInfo &Info, const DIDerivedType *DDTy); void collectMemberInfo(ClassInfo &Info, const DIDerivedType *DDTy);
ClassInfo &collectClassInfo(const DICompositeType *Ty); ClassInfo collectClassInfo(const DICompositeType *Ty);
/// Common record member lowering functionality for record types, which are /// Common record member lowering functionality for record types, which are
/// structs, classes, and unions. Returns the field list index and the member /// structs, classes, and unions. Returns the field list index and the member