[cfe-commits] r90387 - /cfe/trunk/lib/CodeGen/CGVtable.cpp

[Anders Carlsson]

Author: andersca
Date: Wed Dec  2 20:03:29 2009
New Revision: 90387

URL: http://llvm.org/viewvc/llvm-project?rev=90387&view=rev
Log:
Store a GlobalDecl in the return adjustment.

Modified:
    cfe/trunk/lib/CodeGen/CGVtable.cpp

Modified: cfe/trunk/lib/CodeGen/CGVtable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGVtable.cpp?rev=90387&r1=90386&r2=90387&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Wed Dec  2 20:03:29 2009
@@ -81,7 +81,8 @@
     CovariantThunk()
       : Index(0) { }
     
-    CovariantThunk(uint64_t Index, const ThunkAdjustment &ReturnAdjustment, 
+    CovariantThunk(uint64_t Index, GlobalDecl GD,
+                   const ThunkAdjustment &ReturnAdjustment, 
                    CanQualType ReturnType) 
       : Index(Index), ReturnAdjustment(ReturnAdjustment), 
       ReturnType(ReturnType) { }
@@ -89,6 +90,8 @@
     // Index - The index in the vtable.
     uint64_t Index;
     
+    GlobalDecl GD;
+    
     /// ReturnAdjustment - The covariant thunk return adjustment.
     ThunkAdjustment ReturnAdjustment;
     
@@ -290,7 +293,7 @@
         CGM.BuildCovariantThunk(MD, Extern, Adjustment);
     }
     CovariantThunks.clear();
-
+    
     for (ThunksMapTy::const_iterator i = Thunks.begin(), e = Thunks.end();
          i != e; ++i) {
       GlobalDecl GD = i->first;
@@ -762,7 +765,7 @@
         // FIXME: Do we always have to build a covariant thunk to save oret,
         // which is the containing virtual base class?
         if (!ReturnAdjustment.isEmpty())
-          CovariantThunks[GD] = CovariantThunk(i, ReturnAdjustment, oret);
+          CovariantThunks[GD] = CovariantThunk(i, GD, ReturnAdjustment, oret);
 
         if (!isPure && !ThisAdjustment.isEmpty())
           Thunks[GD] = Thunk(i, ThisAdjustment);
@@ -777,7 +780,7 @@
         
         if (!ReturnAdjustment.isEmpty())
           CovariantThunks[GD] = 
-            CovariantThunk(i, ReturnAdjustment, oret);
+            CovariantThunk(i, GD, ReturnAdjustment, oret);
 
         if (!isPure)
           Thunks[GD] = Thunk(i, ThisAdjustment);