Update ClangImporter and IRGenDebugInfo to build with upstream clang

(cherry picked from commit dab04d0)
(cherry picked from commit d6b6594)

Author: Jacob Mizraji

lib/ClangImporter/ClangImporter.cpp

@@ -453,7 +453,7 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
     invocationArgStrs.push_back("-fmodules-cache-path=");
     invocationArgStrs.back().append(moduleCachePath);
   }
-  
+
   if (importerOpts.DetailedPreprocessingRecord) {
     invocationArgStrs.insert(invocationArgStrs.end(), {
       "-Xclang", "-detailed-preprocessing-record",
@@ -831,7 +831,7 @@ void ClangImporter::Implementation::addMacrosToLookupTable(
       // Check whether we have a macro defined in this module.
       auto info = pp.getMacroInfo(macro.first);
       if (!info || info->isFromASTFile() || info->isBuiltinMacro()) continue;
-      
+
       // Only interested in macro definitions.
       auto *defMD = dyn_cast<clang::DefMacroDirective>(MD);
       if (!defMD) continue;
@@ -909,7 +909,7 @@ bool ClangImporter::Implementation::importHeader(
   // Force the import to occur.
   pp.LookAhead(0);
 
-  SmallVector<clang::DeclGroupRef, 16> allParsedDecls;  
+  SmallVector<clang::DeclGroupRef, 16> allParsedDecls;
   auto handleParsed = [&](clang::DeclGroupRef parsed) {
     if (trackParsedSymbols) {
       for (auto *D : parsed) {
@@ -3144,7 +3144,7 @@ isAccessibilityConformingContext(const clang::DeclContext *ctx) {
       return true;
   }
   return false;
-  
+
 }
 
 /// Determine whether the given method potentially conflicts with the
@@ -3907,7 +3907,7 @@ static bool isVisibleClangEntry(clang::ASTContext &ctx,
   // Check whether the macro is defined.
   auto clangMacro = entry.get<clang::MacroInfo *>();
   if (auto moduleID = clangMacro->getOwningModuleID()) {
-    if (auto module = ctx.getExternalSource()->getModule(moduleID)) 
+    if (auto module = ctx.getExternalSource()->getModule(moduleID))
       return module->NameVisibility == clang::Module::AllVisible;
   }
 
@@ -3976,7 +3976,8 @@ void ClangImporter::loadObjCMethods(
   SmallVector<clang::ObjCMethodDecl *, 4> objcMethods;
   auto &sema = Impl.Instance->getSema();
   sema.CollectMultipleMethodsInGlobalPool(clangSelector, objcMethods,
-                                          isInstanceMethod);
+                                          isInstanceMethod,
+                                          /*CheckTheOther=*/false);
 
   // Check whether this method is in the class we care about.
   SmallVector<AbstractFunctionDecl *, 4> foundMethods;
@@ -4054,10 +4055,12 @@ void ClangModuleUnit::lookupObjCMethods(
   auto &clangSema = owner.Impl.getClangSema();
   clangSema.CollectMultipleMethodsInGlobalPool(clangSelector,
                                                objcMethods,
-                                               /*instance=*/true);
+                                               /*instance=*/true,
+                                               /*CheckTheOther=*/false);
   clangSema.CollectMultipleMethodsInGlobalPool(clangSelector,
                                                objcMethods,
-                                               /*instance=*/false);
+                                               /*instance=*/false,
+                                               /*CheckTheOther=*/false);
 
   // Import the methods.
   auto &clangCtx = clangSema.getASTContext();
@@ -4102,7 +4105,7 @@ void ClangModuleUnit::collectLinkLibraries(
       kind = LibraryKind::Framework;
     else
       kind = LibraryKind::Library;
-    
+
     callback(LinkLibrary(clangLinkLib.Library, kind));
   }
 }
@@ -4694,7 +4697,7 @@ EffectiveClangContext ClangImporter::Implementation::getEffectiveClangContext(
 
         /// FIXME: Other type declarations should also be okay?
       }
-    }    
+    }
   }
 
   return EffectiveClangContext();

lib/IRGen/IRGenDebugInfo.cpp

@@ -137,8 +137,8 @@ IRGenDebugInfo::IRGenDebugInfo(const IRGenOptions &Opts,
       Lang, AbsMainFile, Opts.DebugCompilationDir, Producer, IsOptimized,
       Flags, MajorRuntimeVersion, SplitName,
       Opts.DebugInfoKind == IRGenDebugInfoKind::LineTables
-          ? llvm::DIBuilder::LineTablesOnly
-          : llvm::DIBuilder::FullDebug);
+          ? llvm::DICompileUnit::LineTablesOnly
+          : llvm::DICompileUnit::FullDebug);
   MainFile = getOrCreateFile(BumpAllocatedString(AbsMainFile).data());
 
   // Because the swift compiler relies on Clang to setup the Module,
@@ -1458,7 +1458,7 @@ llvm::DIType *IRGenDebugInfo::createType(DebugTypeInfo DbgTy,
         llvm::dwarf::DW_TAG_structure_type, MangledName, Scope, File, 0,
           llvm::dwarf::DW_LANG_Swift, SizeInBits, AlignInBits, Flags,
           MangledName));
-    
+
     DITypeCache[DbgTy.getType()] = llvm::TrackingMDNodeRef(FwdDecl.get());
 
     unsigned RealSize;
@@ -1663,7 +1663,7 @@ llvm::DIType *IRGenDebugInfo::createType(DebugTypeInfo DbgTy,
     auto *CanTy = DictionaryTy->getDesugaredType();
     return getOrCreateDesugaredType(CanTy, DbgTy);
   }
-    
+
   case TypeKind::GenericTypeParam: {
     auto *ParamTy = cast<GenericTypeParamType>(BaseTy);
     // FIXME: Provide a more meaningful debug type.