intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-04 20:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

We want to add all thunks, not just 'this' adjustment thunks.

Browse Source 
llvm-svn: 99177
This commit is contained in:
Anders Carlsson
2010-03-22 15:47:01 +00:00
parent a0170209af
commit 64decd3586
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1423,12 +1423,35 @@ void VtableBuilder::ComputeThisAdjustments() {
// Add an adjustment for the deleting destructor as well.
Thunks[VtableIndex + 1].This = ThisAdjustment;
}
AddThunk(Overrider.Method, Thunks[VtableIndex]);
}
/// Clear the method info map.
MethodInfoMap.clear();
if (isBuildingConstructorVtable()) {
// We don't need to store thunk information for construction vtables.
return;
}
for (ThunksInfoMapTy::const_iterator I = Thunks.begin(), E = Thunks.end();
I != E; ++I) {
const VtableComponent &Component = Components[I->first];
const ThunkInfo &Thunk = I->second;
switch (Component.getKind()) {
default:
llvm_unreachable("Unexpected vtable component kind!");
case VtableComponent::CK_FunctionPointer:
AddThunk(Component.getFunctionDecl(), Thunk);
break;
case VtableComponent::CK_CompleteDtorPointer:
AddThunk(Component.getDestructorDecl(), Thunk);
break;
case VtableComponent::CK_DeletingDtorPointer:
// We've already added the thunk when we saw the complete dtor pointer.
break;
}
}
}
VtableBuilder::ReturnAdjustment