[cfe-commits] r90399 - /cfe/trunk/lib/CodeGen/CGVtable.cpp
Anders Carlsson
andersca at mac.com
Wed Dec 2 18:39:59 PST 2009
Author: andersca
Date: Wed Dec 2 20:39:59 2009
New Revision: 90399
URL: http://llvm.org/viewvc/llvm-project?rev=90399&view=rev
Log:
Change the Thunks map to use the vtable index as the key.
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=90399&r1=90398&r2=90399&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Wed Dec 2 20:39:59 2009
@@ -75,7 +75,7 @@
};
/// Thunks - The thunks in a vtable.
- typedef llvm::DenseMap<GlobalDecl, Thunk> ThunksMapTy;
+ typedef llvm::DenseMap<uint64_t, Thunk> ThunksMapTy;
ThunksMapTy Thunks;
/// CovariantThunk - Represents a single covariant thunk.
@@ -272,7 +272,7 @@
// Check if there is an adjustment for the 'this' pointer.
ThunkAdjustment ThisAdjustment;
- ThunksMapTy::iterator i = Thunks.find(GD);
+ ThunksMapTy::iterator i = Thunks.find(Index);
if (i != Thunks.end()) {
ThisAdjustment = i->second.Adjustment;
@@ -298,12 +298,14 @@
for (ThunksMapTy::const_iterator i = Thunks.begin(), e = Thunks.end();
i != e; ++i) {
- GlobalDecl GD = i->first;
+ GlobalDecl GD = i->second.GD;
const CXXMethodDecl *MD = cast<CXXMethodDecl>(GD.getDecl());
assert(!MD->isPure() && "Can't thunk pure virtual methods!");
const Thunk& Thunk = i->second;
- assert(Thunk.Index == Index[GD] && "Thunk index mismatch!");
+ uint64_t Index = Thunk.Index;
+
+ assert(Index == VtableBuilder::Index[GD] && "Thunk index mismatch!");
submethods[Thunk.Index] = CGM.BuildThunk(MD, Extern, Thunk.Adjustment);
}
@@ -817,7 +819,7 @@
if (isPure)
PureVirtualMethods.insert(GD);
PureVirtualMethods.erase(OGD);
- Thunks.erase(OGD);
+ Thunks.erase(i);
if (MorallyVirtual || VCall.count(OGD)) {
Index_t &idx = VCall[OGD];
if (idx == 0) {
@@ -849,7 +851,7 @@
VirtualAdjustment);
if (!isPure && !ThisAdjustment.isEmpty())
- Thunks[GD] = Thunk(i, GD, ThisAdjustment);
+ Thunks[i] = Thunk(i, GD, ThisAdjustment);
return true;
}
@@ -860,7 +862,7 @@
ThunkAdjustment ThisAdjustment(NonVirtualAdjustment, 0);
if (!isPure)
- Thunks[GD] = Thunk(i, GD, ThisAdjustment);
+ Thunks[i] = Thunk(i, GD, ThisAdjustment);
}
return true;
}
More information about the cfe-commits
mailing list