No need to use CGM.getCXXABI() from CXXABI

llvm-svn: 194584
This commit is contained in:
Timur Iskhodzhanov 2013-11-13 16:03:43 +00:00
parent 0706e5dd36
commit 4ddf59201a
1 changed files with 4 additions and 4 deletions

View File

@ -506,8 +506,8 @@ void MicrosoftCXXABI::initializeHiddenVirtualInheritanceMembers(
if (!I->second.hasVtorDisp())
continue;
llvm::Value *VBaseOffset = CGM.getCXXABI().GetVirtualBaseClassOffset(
CGF, getThisValue(CGF), RD, I->first);
llvm::Value *VBaseOffset =
GetVirtualBaseClassOffset(CGF, getThisValue(CGF), RD, I->first);
// FIXME: it doesn't look right that we SExt in GetVirtualBaseClassOffset()
// just to Trunc back immediately.
VBaseOffset = Builder.CreateTruncOrBitCast(VBaseOffset, CGF.Int32Ty);
@ -642,8 +642,8 @@ llvm::Value *MicrosoftCXXABI::adjustThisArgumentForVirtualCall(
StaticOffset += Layout.getVBaseClassOffset(ML.VBase);
} else {
This = CGF.Builder.CreateBitCast(This, charPtrTy);
llvm::Value *VBaseOffset = CGM.getCXXABI()
.GetVirtualBaseClassOffset(CGF, This, MD->getParent(), ML.VBase);
llvm::Value *VBaseOffset =
GetVirtualBaseClassOffset(CGF, This, MD->getParent(), ML.VBase);
This = CGF.Builder.CreateInBoundsGEP(This, VBaseOffset);
}
}