commit 4ddf59201a7e9175bfad25bfeba62c7cb1e9985b
author Timur Iskhodzhanov <timurrrr@google.com> Wed Nov 13 16:03:43 2013 +0000
committer Timur Iskhodzhanov <timurrrr@google.com> Wed Nov 13 16:03:43 2013 +0000
tree 6d8fa83cfdaefd708c6e362d1db74c3634ca2ce8
parent 0706e5dd369a9101f6db195b66623306bc76b520

No need to use CGM.getCXXABI() from CXXABI

llvm-svn: 194584

clang/lib/CodeGen/MicrosoftCXXABI.cpp

diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
index 9c11893..8617482 100644
--- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp
+++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp
@@ -506,8 +506,8 @@
     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 @@
       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);
     }
   }