From 4ddf59201a7e9175bfad25bfeba62c7cb1e9985b Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Wed, 13 Nov 2013 16:03:43 +0000 Subject: [PATCH] No need to use CGM.getCXXABI() from CXXABI llvm-svn: 194584 --- clang/lib/CodeGen/MicrosoftCXXABI.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index 9c11893c17f7..86174826bd81 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -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); } }