aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGVtable.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2009-12-06 22:33:51 +0000
committerEli Friedman <eli.friedman@gmail.com>2009-12-06 22:33:51 +0000
commitf062d9d443865413af5b9c9c55238c2ee0799d31 (patch)
treeb81887866275b8318b363261d46d38310079b5dd /lib/CodeGen/CGVtable.cpp
parent72649ed78a25365d003b5218cae7b332c418800e (diff)
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
Diffstat (limited to 'lib/CodeGen/CGVtable.cpp')
-rw-r--r--lib/CodeGen/CGVtable.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 857e661254..6fda6a4404 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -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;
}