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

Merge base offsets and dump them. 

llvm-svn: 96121
This commit is contained in:
Anders Carlsson 2010-02-13 21:33:22 +00:00
parent c1290adab7
commit 3f9917de6e
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
clang/lib/CodeGen/CGVtable.cpp
View File

@ -264,6 +264,18 @@ FinalOverriders::FinalOverriders(const CXXRecordDecl *MostDerivedClass)
// And dump them (for now).
dump();
// Also dump the base offsets (for now).
for (SubobjectOffsetsMapTy::const_iterator I = Offsets.begin(),
E = Offsets.end(); I != E; ++I) {
const OffsetVectorTy& OffsetVector = I->second;
llvm::errs() << "Base offsets for ";
llvm::errs() << I->first->getQualifiedNameAsString() << '\n';
for (unsigned I = 0, E = OffsetVector.size(); I != E; ++I)
llvm::errs() << " " << I << " - " << OffsetVector[I] << '\n';
}
}
void FinalOverriders::AddOverriders(BaseSubobject Base,
@ -452,17 +464,41 @@ FinalOverriders::MergeSubobjectOffsets(const SubobjectOffsetsMapTy &NewOffsets,
for (SubobjectOffsetsMapTy::const_iterator I = NewOffsets.begin(),
E = NewOffsets.end(); I != E; ++I) {
const CXXRecordDecl *NewRD = I->first;
const OffsetVectorTy& NewOffsetsVector = I->second;
const OffsetVectorTy& NewOffsetVector = I->second;
OffsetVectorTy &OffsetsVector = Offsets[NewRD];
if (OffsetsVector.empty()) {
OffsetVectorTy &OffsetVector = Offsets[NewRD];
if (OffsetVector.empty()) {
// There were no previous offsets in this vector, just insert all entries
// from the new offsets vector.
OffsetsVector.append(NewOffsetsVector.begin(), NewOffsetsVector.end());
// from the new offset vector.
OffsetVector.append(NewOffsetVector.begin(), NewOffsetVector.end());
continue;
}
assert(false && "FIXME: Handle merging the subobject offsets!");
// We need to merge the new offsets vector into the old, but we don't want
// to have duplicate entries. Do this by inserting the old offsets in a set
// so they'll be unique. After this, we iterate over the new offset vector
// and only append elements that aren't in the set.
// First, add the existing offsets to the set.
llvm::SmallSet<uint64_t, 4> OffsetSet;
for (unsigned I = 0, E = OffsetVector.size(); I != E; ++I) {
bool Inserted = OffsetSet.insert(OffsetVector[I]);
if (!Inserted)
assert(false && "Set of offsets should be unique!");
}
// Next, only add the new offsets if they are not already in the set.
for (unsigned I = 0, E = NewOffsetVector.size(); I != E; ++I) {
uint64_t Offset = NewOffsetVector[I];
if (OffsetSet.count(Offset)) {
// Ignore the offset.
continue;
}
// Otherwise, add it to the offsets vector.
OffsetVector.push_back(Offset);
}
}
}