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/CGCXX.cpp

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 25f3e6f..31134be 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -295,9 +295,9 @@
   Ty = Ty->getPointerTo()->getPointerTo();
   VTable = CGF.Builder.CreateBitCast(VTable, Ty);
   assert(VTable && "BuildVirtualCall = kext vtbl pointer is null");
-  uint64_t VTableIndex = CGM.getVTableContext().getMethodVTableIndex(GD);
+  uint64_t VTableIndex = CGM.getItaniumVTableContext().getMethodVTableIndex(GD);
   uint64_t AddressPoint =
-    CGM.getVTableContext().getVTableLayout(RD)
+    CGM.getItaniumVTableContext().getVTableLayout(RD)
        .getAddressPoint(BaseSubobject(RD, CharUnits::Zero()));
   VTableIndex += AddressPoint;
   llvm::Value *VFuncPtr =