We always want to create a virtual function pointer entry if the path from the derived return value to the base overridden return value contains a virtual base class.
llvm-svn: 90024
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 57a8287..a26a697 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -800,35 +800,13 @@
return false;
}
+ // If we found a virtual base we always want to require adjustment.
+ if (Paths.getDetectedVirtual())
+ return true;
+
const CXXBasePath &Path = Paths.front();
- size_t Start = 0, End = Path.size();
-
- // Check if we have a virtual base.
- if (const RecordType *RT = Paths.getDetectedVirtual()) {
- const CXXRecordDecl *VirtualBase = cast<CXXRecordDecl>(RT->getDecl());
- assert(VirtualBase->isCanonicalDecl() && "Must have canonical decl!");
-
- // Check the virtual base class offset.
- const ASTRecordLayout &Layout = Ctx.getASTRecordLayout(DerivedDecl);
-
- if (Layout.getVBaseClassOffset(VirtualBase) != 0) {
- // This requires an adjustment.
- return true;
- }
-
- // Now ignore all the path elements up to the virtual base.
- // FIXME: It would be nice if CXXBasePaths could return an index to the
- // CXXElementSpecifier that corresponded to the virtual base.
- for (; Start != End; ++Start) {
- const CXXBasePathElement& Element = Path[Start];
-
- if (Element.Class == VirtualBase)
- break;
- }
- }
-
- for (; Start != End; ++Start) {
+ for (size_t Start = 0, End = Path.size(); Start != End; ++Start) {
const CXXBasePathElement &Element = Path[Start];
// Check the base class offset.