From c84a8bf7fec968a2daa2431ccbd55633d6a8b1a9 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 17 Feb 2010 06:30:02 +0000 Subject: [PATCH] Handle primary bases in AddVCallOffsets. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96461 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGVtable.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp index 2b8b064f26..58989ede0b 100644 --- a/lib/CodeGen/CGVtable.cpp +++ b/lib/CodeGen/CGVtable.cpp @@ -985,10 +985,17 @@ VtableBuilder::AddVCallAndVBaseOffsets(BaseSubobject Base, void VtableBuilder::AddVCallOffsets(BaseSubobject Base) { const CXXRecordDecl *RD = Base.getBase(); - const ASTRecordLayout &Layout = Context.getASTRecordLayout(RD); + + // Handle the primary base first. const CXXRecordDecl *PrimaryBase = Layout.getPrimaryBase(); - assert(!PrimaryBase && "FIXME: Handle the primary base!"); + if (PrimaryBase && Layout.getPrimaryBaseWasVirtual()) { + // Get the base offset of the primary base. + uint64_t PrimaryBaseOffset = Base.getBaseOffset() + + Layout.getBaseClassOffset(PrimaryBase); + + AddVCallOffsets(BaseSubobject(PrimaryBase, PrimaryBaseOffset)); + } // Add the vcall offsets. for (CXXRecordDecl::method_iterator I = RD->method_begin(), -- 2.50.1