---

yaml
---
r: 349425
b: refs/heads/master-next
c: 970eb2f
h: refs/heads/master
i:
  349423: 5c42fe5

Author: JDevlieghere

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 4722e1e918588f074ecb52c05c90884f3a7b915a
+refs/heads/master-next: 970eb2f43939b72c0371273e31f1c2ca7ccc435a
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/ClangImporter/ClangImporter.cpp

@@ -1172,7 +1172,7 @@ ClangImporter::create(ASTContext &ctx, const ClangImporterOptions &importerOpts,
 bool ClangImporter::addSearchPath(StringRef newSearchPath, bool isFramework,
                                   bool isSystem) {
   clang::FileManager &fileMgr = Impl.Instance->getFileManager();
-  const clang::DirectoryEntry *entry = fileMgr.getDirectory(newSearchPath);
+  auto entry = fileMgr.getDirectory(newSearchPath);
   if (!entry)
     return true;
 
@@ -1181,8 +1181,8 @@ bool ClangImporter::addSearchPath(StringRef newSearchPath, bool isFramework,
                             headerSearchInfo.search_dir_end(),
                             [&](const clang::DirectoryLookup &lookup) -> bool {
     if (isFramework)
-      return lookup.getFrameworkDir() == entry;
-    return lookup.getDir() == entry;
+      return lookup.getFrameworkDir() == *entry;
+    return lookup.getDir() == *entry;
   });
   if (exists) {
     // Don't bother adding a search path that's already there. Clang would have
@@ -1191,7 +1191,7 @@ bool ClangImporter::addSearchPath(StringRef newSearchPath, bool isFramework,
   }
 
   auto kind = isSystem ? clang::SrcMgr::C_System : clang::SrcMgr::C_User;
-  headerSearchInfo.AddSearchPath({entry, kind, isFramework},
+  headerSearchInfo.AddSearchPath({*entry, kind, isFramework},
                                  /*isAngled=*/true);
 
   // In addition to changing the current preprocessor directly, we still need
@@ -1353,10 +1353,9 @@ bool ClangImporter::importHeader(StringRef header, ModuleDecl *adapter,
                                  off_t expectedSize, time_t expectedModTime,
                                  StringRef cachedContents, SourceLoc diagLoc) {
   clang::FileManager &fileManager = Impl.Instance->getFileManager();
-  const clang::FileEntry *headerFile = fileManager.getFile(header,
-                                                           /*OpenFile=*/true);
-  if (headerFile && headerFile->getSize() == expectedSize &&
-      headerFile->getModificationTime() == expectedModTime) {
+  auto headerFile = fileManager.getFile(header, /*OpenFile=*/true);
+  if (headerFile && (*headerFile)->getSize() == expectedSize &&
+      (*headerFile)->getModificationTime() == expectedModTime) {
     return importBridgingHeader(header, adapter, diagLoc, false, true);
   }
 
@@ -1389,8 +1388,7 @@ bool ClangImporter::importBridgingHeader(StringRef header, ModuleDecl *adapter,
   }
 
   clang::FileManager &fileManager = Impl.Instance->getFileManager();
-  const clang::FileEntry *headerFile = fileManager.getFile(header,
-                                                           /*OpenFile=*/true);
+  auto headerFile = fileManager.getFile(header, /*OpenFile=*/true);
   if (!headerFile) {
     Impl.SwiftContext.Diags.diagnose(diagLoc, diag::bridging_header_missing,
                                      header);
@@ -1466,9 +1464,10 @@ std::string ClangImporter::getBridgingHeaderContents(StringRef headerPath,
     return "";
   }
 
-  const clang::FileEntry *fileInfo = fileManager.getFile(headerPath);
-  fileSize = fileInfo->getSize();
-  fileModTime = fileInfo->getModificationTime();
+  if (auto fileInfo = fileManager.getFile(headerPath)) {
+    fileSize = (*fileInfo)->getSize();
+    fileModTime = (*fileInfo)->getModificationTime();
+  }
   return result;
 }
 
@@ -2411,8 +2410,7 @@ void ClangImporter::lookupBridgingHeaderDecls(
 bool ClangImporter::lookupDeclsFromHeader(StringRef Filename,
                               llvm::function_ref<bool(ClangNode)> filter,
                               llvm::function_ref<void(Decl*)> receiver) const {
-  const clang::FileEntry *File =
-    getClangPreprocessor().getFileManager().getFile(Filename);
+  auto File = getClangPreprocessor().getFileManager().getFile(Filename);
   if (!File)
     return true;
 
@@ -2421,7 +2419,7 @@ bool ClangImporter::lookupDeclsFromHeader(StringRef Filename,
   auto &ClangPP = getClangPreprocessor();
 
   // Look up the header in the includes of the bridging header.
-  if (Impl.BridgeHeaderFiles.count(File)) {
+  if (Impl.BridgeHeaderFiles.count(*File)) {
     auto headerFilter = [&](ClangNode ClangN) -> bool {
       if (ClangN.isNull())
         return false;
@@ -2430,7 +2428,7 @@ bool ClangImporter::lookupDeclsFromHeader(StringRef Filename,
       if (ClangLoc.isInvalid())
         return false;
 
-      if (ClangSM.getFileEntryForID(ClangSM.getFileID(ClangLoc)) != File)
+      if (ClangSM.getFileEntryForID(ClangSM.getFileID(ClangLoc)) != *File)
         return false;
 
       return filter(ClangN);
@@ -2440,7 +2438,7 @@ bool ClangImporter::lookupDeclsFromHeader(StringRef Filename,
     return false;
   }
 
-  clang::FileID FID = ClangSM.translateFile(File);
+  clang::FileID FID = ClangSM.translateFile(*File);
   if (FID.isInvalid())
     return false;
 

branches/master-next/lib/Index/IndexRecord.cpp

@@ -405,7 +405,7 @@ static void addModuleDependencies(ArrayRef<ModuleDecl::ImportedModule> imports,
       case FileUnitKind::DWARFModule:
       case FileUnitKind::ClangModule: {
         auto *LFU = cast<LoadedFile>(FU);
-        if (auto *F = fileMgr.getFile(LFU->getFilename())) {
+        if (auto F = fileMgr.getFile(LFU->getFilename())) {
           std::string moduleName = mod->getNameStr();
           bool withoutUnitName = true;
           if (FU->getKind() == FileUnitKind::ClangModule) {
@@ -434,7 +434,7 @@ static void addModuleDependencies(ArrayRef<ModuleDecl::ImportedModule> imports,
           }
           clang::index::writer::OpaqueModule opaqMod =
               moduleNameScratch.createString(moduleName);
-          unitWriter.addASTFileDependency(F, mod->isSystemModule(), opaqMod,
+          unitWriter.addASTFileDependency(*F, mod->isSystemModule(), opaqMod,
                                           withoutUnitName);
         }
         break;
@@ -547,15 +547,15 @@ emitDataForSwiftSerializedModule(ModuleDecl *module,
     /*MainFile=*/nullptr, isSystem, /*IsModuleUnit=*/true,
     isDebugCompilation, targetTriple, sysrootPath, getModuleInfoFromOpaqueModule);
 
-  const clang::FileEntry *FE = fileMgr.getFile(filename);
+  auto FE = fileMgr.getFile(filename);
   bool isSystemModule = module->isSystemModule();
   for (auto &pair : records) {
     std::string &recordFile = pair.first;
     std::string &groupName = pair.second;
     if (recordFile.empty())
       continue;
     clang::index::writer::OpaqueModule mod = &groupName;
-    unitWriter.addRecordFile(recordFile, FE, isSystemModule, mod);
+    unitWriter.addRecordFile(recordFile, *FE, isSystemModule, mod);
   }
 
   ModuleDecl::ImportFilter importFilter;
@@ -585,15 +585,16 @@ recordSourceFileUnit(SourceFile *primarySourceFile, StringRef indexUnitToken,
   auto &fileMgr = clangCI.getFileManager();
   auto *module = primarySourceFile->getParentModule();
   bool isSystem = module->isSystemModule();
-  auto *mainFile = fileMgr.getFile(primarySourceFile->getFilename());
+  auto mainFile = fileMgr.getFile(primarySourceFile->getFilename());
   // FIXME: Get real values for the following.
   StringRef swiftVersion;
   StringRef sysrootPath = clangCI.getHeaderSearchOpts().Sysroot;
 
-  IndexUnitWriter unitWriter(fileMgr, indexStorePath,
-    "swift", swiftVersion, indexUnitToken, module->getNameStr(),
-    mainFile, isSystem, /*isModuleUnit=*/false, isDebugCompilation,
-    targetTriple, sysrootPath, getModuleInfoFromOpaqueModule);
+  IndexUnitWriter unitWriter(
+      fileMgr, indexStorePath, "swift", swiftVersion, indexUnitToken,
+      module->getNameStr(), mainFile ? *mainFile : nullptr, isSystem,
+      /*isModuleUnit=*/false, isDebugCompilation, targetTriple, sysrootPath,
+      getModuleInfoFromOpaqueModule);
 
   // Module dependencies.
   ModuleDecl::ImportFilter importFilter;
@@ -612,9 +613,11 @@ recordSourceFileUnit(SourceFile *primarySourceFile, StringRef indexUnitToken,
 
   recordSourceFile(primarySourceFile, indexStorePath, diags,
                    [&](StringRef recordFile, StringRef filename) {
-    unitWriter.addRecordFile(recordFile, fileMgr.getFile(filename),
-                             module->isSystemModule(), /*Module=*/nullptr);
-  });
+                     auto file = fileMgr.getFile(filename);
+                     unitWriter.addRecordFile(
+                         recordFile, file ? *file : nullptr,
+                         module->isSystemModule(), /*Module=*/nullptr);
+                   });
 
   std::string error;
   if (unitWriter.write(error)) {