Store the base offset of the final overrider in the OverriderInfo struct, to be used for vcall offsets.
llvm-svn: 96582
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index b4c10a5..1f4d64d 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -58,8 +58,11 @@
struct OverriderInfo {
/// Method - The method decl of the overrider.
const CXXMethodDecl *Method;
+
+ /// BaseOffset - the base offset of the overrider.
+ uint64_t BaseOffset;
- OverriderInfo() : Method(0) { }
+ OverriderInfo() : Method(0), BaseOffset(0) { }
};
private:
@@ -236,6 +239,7 @@
OverriderInfo& Overrider = OverridersMap[std::make_pair(Base, MD)];
assert(!Overrider.Method && "Overrider should not exist yet!");
+ Overrider.BaseOffset = Base.getBaseOffset();
Overrider.Method = MD;
}
}
@@ -460,6 +464,7 @@
}
// Set the new overrider.
+ Overrider.BaseOffset = NewBase.getBaseOffset();
Overrider.Method = NewMD;
// And propagate it further.