Store a GlobalDecl in the return adjustment.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90387 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 58d9a55..be9c85a 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -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);