r191854 - Use the CGCXXABI member on CodeGenTypes.

[Mark Lacey]

Author: rudkx
Date: Wed Oct  2 15:35:23 2013
New Revision: 191854

URL: http://llvm.org/viewvc/llvm-project?rev=191854&view=rev
Log:
Use the CGCXXABI member on CodeGenTypes.

CodeGenTypes already has a reference to a CGCXXABI. Use this directly
rather than going through CodeGenModule to get to the same information.

This is consistent with other references to CGCXXABI in CodeGenTypes
functions defined in CGCall.cpp.

Modified:
    cfe/trunk/lib/CodeGen/CGCall.cpp
    cfe/trunk/lib/CodeGen/TargetInfo.cpp

Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=191854&r1=191853&r2=191854&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Wed Oct  2 15:35:23 2013
@@ -182,8 +182,7 @@ CodeGenTypes::arrangeCXXMethodDeclaratio
 
   if (MD->isInstance()) {
     // The abstract case is perfectly fine.
-    const CXXRecordDecl *ThisType =
-        CGM.getCXXABI().getThisArgumentTypeForMethod(MD);
+    const CXXRecordDecl *ThisType = TheCXXABI.getThisArgumentTypeForMethod(MD);
     return arrangeCXXMethodType(ThisType, prototype.getTypePtr());
   }
 

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=191854&r1=191853&r2=191854&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Wed Oct  2 15:35:23 2013
@@ -48,7 +48,7 @@ static bool isRecordReturnIndirect(const
   const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl());
   if (!RD)
     return false;
-  return CGT.CGM.getCXXABI().isReturnTypeIndirect(RD);
+  return CGT.getCXXABI().isReturnTypeIndirect(RD);
 }
 
 
@@ -64,7 +64,7 @@ static CGCXXABI::RecordArgABI getRecordA
   const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl());
   if (!RD)
     return CGCXXABI::RAA_Default;
-  return CGT.CGM.getCXXABI().getRecordArgABI(RD);
+  return CGT.getCXXABI().getRecordArgABI(RD);
 }
 
 static CGCXXABI::RecordArgABI getRecordArgABI(QualType T,