[cfe-commits] r97546 - /cfe/trunk/lib/CodeGen/CGVtable.cpp
Anders Carlsson
andersca at mac.com
Mon Mar 1 19:44:06 PST 2010
Author: andersca
Date: Mon Mar 1 21:44:06 2010
New Revision: 97546
URL: http://llvm.org/viewvc/llvm-project?rev=97546&view=rev
Log:
Rename BaseOffset to Offset and make it signed in preparation of more construction vtable work.
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=97546&r1=97545&r2=97546&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Mon Mar 1 21:44:06 2010
@@ -60,10 +60,10 @@
/// Method - The method decl of the overrider.
const CXXMethodDecl *Method;
- /// BaseOffset - the base offset of the overrider.
- uint64_t BaseOffset;
+ /// Offset - the base offset of the overrider relative to the layout class.
+ int64_t Offset;
- OverriderInfo() : Method(0), BaseOffset(0) { }
+ OverriderInfo() : Method(0), Offset(0) { }
};
private:
@@ -227,7 +227,7 @@
OverriderInfo& Overrider = OverridersMap[std::make_pair(Base, MD)];
assert(!Overrider.Method && "Overrider should not exist yet!");
- Overrider.BaseOffset = Base.getBaseOffset();
+ Overrider.Offset = Base.getBaseOffset();
Overrider.Method = MD;
}
}
@@ -388,7 +388,7 @@
}
// Set the new overrider.
- Overrider.BaseOffset = NewBase.getBaseOffset();
+ Overrider.Offset = NewBase.getBaseOffset();
Overrider.Method = NewMD;
// And propagate it further.
@@ -548,9 +548,10 @@
OverriderInfo Overrider = getOverrider(Base, MD);
- Out << " " << MD->getQualifiedNameAsString() << " - ";
+ Out << " " << MD->getQualifiedNameAsString() << " - (";
Out << Overrider.Method->getQualifiedNameAsString();
-
+ Out << ", " << Overrider.Offset << ')';
+
AdjustmentOffsetsMapTy::const_iterator AI =
ReturnAdjustments.find(std::make_pair(Base, MD));
if (AI != ReturnAdjustments.end()) {
@@ -997,7 +998,7 @@
/// The vcall offset is the offset from the virtual base to the object
/// where the function was overridden.
// FIXME: We should not use / 8 here.
- Offset = (int64_t)(Overrider.BaseOffset - VBaseOffset) / 8;
+ Offset = (int64_t)(Overrider.Offset - VBaseOffset) / 8;
}
Components.push_back(VtableComponent::MakeVCallOffset(Offset));
@@ -1297,7 +1298,7 @@
Overriders.getOverrider(OverriddenBaseSubobject, MD);
// Check if we need an adjustment.
- if (Overrider.BaseOffset == MethodInfo.BaseOffset)
+ if (Overrider.Offset == (int64_t)MethodInfo.BaseOffset)
continue;
uint64_t VtableIndex = MethodInfo.VtableIndex;
@@ -1312,7 +1313,7 @@
continue;
BaseSubobject OverriderBaseSubobject(Overrider.Method->getParent(),
- Overrider.BaseOffset);
+ Overrider.Offset);
// Compute the adjustment offset.
BaseOffset ThisAdjustmentOffset =
More information about the cfe-commits
mailing list