r194584 - No need to use CGM.getCXXABI() from CXXABI

[Timur Iskhodzhanov]

Author: timurrrr
Date: Wed Nov 13 10:03:43 2013
New Revision: 194584

URL: http://llvm.org/viewvc/llvm-project?rev=194584&view=rev
Log:
No need to use CGM.getCXXABI() from CXXABI

Modified:
    cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp

Modified: cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp?rev=194584&r1=194583&r2=194584&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp (original)
+++ cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp Wed Nov 13 10:03:43 2013
@@ -506,8 +506,8 @@ void MicrosoftCXXABI::initializeHiddenVi
     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::adjustThis
       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);
     }
   }