Adjust for API changes in Clang.

Author: rjmccall

lib/IRGen/GenCall.cpp

@@ -723,8 +723,8 @@ llvm::Type *SignatureExpansion::expandExternalSignatureTypes() {
 
   // Generate function info for this signature.
   auto extInfo = clang::FunctionType::ExtInfo();
-  auto &FI = IGM.ABITypes->arrangeFreeFunctionCall(clangResultTy, paramTys,
-                                                   extInfo,
+  auto &FI = clang::CodeGen::arrangeFreeFunctionCall(IGM.ClangCodeGen->CGM(),
+                                             clangResultTy, paramTys, extInfo,
                                              clang::CodeGen::RequiredArgs::All);
   ForeignInfo.ClangInfo = &FI;
 

lib/IRGen/IRGenModule.cpp

@@ -52,7 +52,6 @@
 
 using namespace swift;
 using namespace irgen;
-using clang::CodeGen::CodeGenABITypes;
 using llvm::Attribute;
 
 const unsigned DefaultAS = 0;
@@ -387,8 +386,6 @@ IRGenModule::IRGenModule(IRGenerator &irgen,
     RegisterPreservingCC = DefaultCC;
   }
 
-  ABITypes = new CodeGenABITypes(clangASTContext, Module);
-
   if (IRGen.Opts.DebugInfoKind != IRGenDebugInfoKind::None) {
     DebugInfo = new IRGenDebugInfo(IRGen.Opts, *CI, *this, Module, SF);
   }
@@ -399,9 +396,7 @@ IRGenModule::IRGenModule(IRGenerator &irgen,
 IRGenModule::~IRGenModule() {
   destroyClangTypeConverter();
   delete &Types;
-  if (DebugInfo)
-    delete DebugInfo;
-  delete ABITypes;
+  delete DebugInfo;
 }
 
 static bool isReturnAttribute(llvm::Attribute::AttrKind Attr);

lib/IRGen/IRGenModule.h

@@ -66,11 +66,9 @@ namespace clang {
   class Decl;
   class Type;
   namespace CodeGen {
-    class CodeGenABITypes;
     class CGFunctionInfo;
   }
 }
-using clang::CodeGen::CodeGenABITypes;
 
 namespace swift {
   class ArchetypeBuilder;
@@ -361,9 +359,6 @@ class IRGenModule {
   const SwiftTargetInfo TargetInfo;
   /// Holds lexical scope info, etc. Is a nullptr if we compile without -g.
   IRGenDebugInfo *DebugInfo;
-  /// A Clang-to-IR-type converter for types appearing in function
-  /// signatures of Objective-C methods and C functions.
-  CodeGenABITypes *ABITypes;
 
   /// A global variable which stores the hash of the module. Used for
   /// incremental compilation.