зеркало из https://github.com/microsoft/clang-1.git
Be a bit more complete about accumulating SavedThisAdjustments.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90723 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Родитель
72649ed78a
Коммит
f062d9d443
|
@ -838,7 +838,6 @@ bool VtableBuilder::OverrideMethod(GlobalDecl GD, bool MorallyVirtual,
|
|||
|
||||
if (!isPure && !ThisAdjustment.isEmpty()) {
|
||||
ThisAdjustments[Index] = ThisAdjustment;
|
||||
// FIXME: Might this end up inserting some false adjustments?
|
||||
SavedThisAdjustments.push_back(std::make_pair(std::make_pair(GD, OGD),
|
||||
ThisAdjustment));
|
||||
}
|
||||
|
@ -851,8 +850,11 @@ bool VtableBuilder::OverrideMethod(GlobalDecl GD, bool MorallyVirtual,
|
|||
if (NonVirtualAdjustment) {
|
||||
ThunkAdjustment ThisAdjustment(NonVirtualAdjustment, 0);
|
||||
|
||||
if (!isPure)
|
||||
if (!isPure) {
|
||||
ThisAdjustments[Index] = ThisAdjustment;
|
||||
SavedThisAdjustments.push_back(std::make_pair(std::make_pair(GD, OGD),
|
||||
ThisAdjustment));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче