commit 5f0db587078b5af32fc9ac41fe4276b80918fd8d
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 b5b4be2c7ac17eb3ef2c298b54cf0d7bed454748
parent a257e2129c83c06ecd52a5e8eedcdf5aed3f6247

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@194082 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGVTT.cpp

diff --git a/lib/CodeGen/CGVTT.cpp b/lib/CodeGen/CGVTT.cpp
index 31beb02..bfff470 100644
--- a/lib/CodeGen/CGVTT.cpp
+++ b/lib/CodeGen/CGVTT.cpp
@@ -65,8 +65,8 @@
     uint64_t AddressPoint;
     if (VTTVT.getBase() == RD) {
       // Just get the address point for the regular vtable.
-      AddressPoint = VTContext.getVTableLayout(RD)
-                              .getAddressPoint(i->VTableBase);
+      AddressPoint =
+          ItaniumVTContext.getVTableLayout(RD).getAddressPoint(i->VTableBase);
       assert(AddressPoint != 0 && "Did not find vtable address point!");
     } else {
       AddressPoint = VTableAddressPoints[i->VTableIndex].lookup(i->VTableBase);