commit 5877663622877127b0cfdf8230bd627271f50d9c
author Timur Iskhodzhanov <timurrrr@google.com> Tue Nov 05 15:54:58 2013 +0000
committer Timur Iskhodzhanov <timurrrr@google.com> Tue Nov 05 15:54:58 2013 +0000
tree ec078930ca0cb38f7dfd775bcc0f002675d16802
parent 41778fd28f9b6877e34dcced85deb2c6dec50b4a

Fix vbtable indices when a class shares the vbptr with a non-virtual base

llvm-svn: 194082

clang/lib/CodeGen/CGRTTI.cpp

diff --git a/clang/lib/CodeGen/CGRTTI.cpp b/clang/lib/CodeGen/CGRTTI.cpp
index 72d4220..aa687b9 100644
--- a/clang/lib/CodeGen/CGRTTI.cpp
+++ b/clang/lib/CodeGen/CGRTTI.cpp
@@ -846,7 +846,7 @@
     CharUnits Offset;
     if (Base->isVirtual())
       Offset = 
-        CGM.getVTableContext().getVirtualBaseOffsetOffset(RD, BaseDecl);
+        CGM.getItaniumVTableContext().getVirtualBaseOffsetOffset(RD, BaseDecl);
     else {
       const ASTRecordLayout &Layout = CGM.getContext().getASTRecordLayout(RD);
       Offset = Layout.getBaseClassOffset(BaseDecl);