From: Eli Friedman <eli.friedman@gmail.com>
Date: Sun, 6 Dec 2009 22:33:51 +0000 (+0000)
Subject: Be a bit more complete about accumulating SavedThisAdjustments.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f062d9d443865413af5b9c9c55238c2ee0799d31;p=clang

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
---

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;
   }