From 5877663622877127b0cfdf8230bd627271f50d9c Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Tue, 5 Nov 2013 15:54:58 +0000 Subject: Fix vbtable indices when a class shares the vbptr with a non-virtual base llvm-svn: 194082 --- clang/lib/CodeGen/CGVTT.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CGVTT.cpp') diff --git a/clang/lib/CodeGen/CGVTT.cpp b/clang/lib/CodeGen/CGVTT.cpp index 31beb02a52f..bfff4705889 100644 --- a/clang/lib/CodeGen/CGVTT.cpp +++ b/clang/lib/CodeGen/CGVTT.cpp @@ -65,8 +65,8 @@ CodeGenVTables::EmitVTTDefinition(llvm::GlobalVariable *VTT, 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); -- cgit v1.2.3